Commit Graph

75683 Commits

Author SHA1 Message Date
Steven Moreland
98fa8b7eb0 Merge "Generic Mutable class for HIDL code." am: 0f05ce94c3
am: a4ac12c3ac

Change-Id: I1914e805b15064b40b963840eddf87a0bbd41169
2018-01-08 20:25:30 +00:00
nharold
a07d0e463d Merge changes from topic "ipsec-resource-id-cleanup" am: 2b36299c73
am: d7319df4d0

Change-Id: If6ab575e2f30fc70d73e6f8787c87f3c7a2ab09d
2018-01-08 20:16:08 +00:00
Treehugger Robot
0f05ce94c3 Merge "Generic Mutable class for HIDL code." 2018-01-05 21:44:37 +00:00
Steven Moreland
4bfa2ebb89 Generic Mutable class for HIDL code.
In general, using Mutable inside of structures
or as API arguments is a code smell. However, it
is the most syntactically clean way of fetching
something out of a lambda or inner class.

Using this, one can do:
Mutable<Result> res = new Mutable<>();
hidlObject.foo((...) -> {
    res.value = ...;
});

There is an alternative:
Result a[] = new Result[1];
hidlObject.foo((...) -> {
    a[0] = ...;
});

However, this alternative syntax is relatively messy.

Bug: N/A
Test: boot, use w/ wifi
Change-Id: Ibff13c653cc17bd25ddbb0534ba21ef485bff7aa
2018-01-05 19:13:06 +00:00
nharold
2b36299c73 Merge changes from topic "ipsec-resource-id-cleanup"
* changes:
  IpSecService - Convert mNextResourceId from AtomicInt to Int
  IpSec Invalidate the Resource IDs on close()
2018-01-05 19:05:09 +00:00
Andreas Gampe
3fcce9f251 Merge changes I872a81ae,I0b9e72d2 am: f30c2c02f0
am: 34445736d8

Change-Id: I506b0e29977f0fbb410066dea46c99f264e01028
2018-01-05 01:39:13 +00:00
Treehugger Robot
f30c2c02f0 Merge changes I872a81ae,I0b9e72d2
* changes:
  Revert "Frameworks: Move SharedPreferencesImpl to Future"
  Revert "Frameworks: Silently ignore InterruptedException"
2018-01-05 01:14:44 +00:00
Nathan Harold
6119d8d1d0 IpSec Invalidate the Resource IDs on close()
To facilitate error checking we should invalidate
the resource IDs of all objects when we close() them.
Today, the resource ID is invalidated on the Transform
object but not on the SPI or Encap Socket. This CL
unifies the behavior.

Bug: 70641274
Test: cts - IpSecManagerTest
Change-Id: I28caec3e913902c748c6a50b4ef742ccef8b1b09
2018-01-04 15:28:29 -08:00
Qingxi Li
dba6365966 Merge "Add API to get eUICC's OTA status" am: 15a410a75a
am: 412aecc2b0

Change-Id: I50ec4a84ddc30e5232bd0cabb8a721ebb7feca47
2018-01-04 02:09:32 +00:00
Andreas Gampe
158bde462e Revert "Frameworks: Move SharedPreferencesImpl to Future"
This reverts commit 70b600d456.

In preparation for a different fix. There are too many loopholes
with updates vs commits.

Bug: 67986472
Bug: 71533447
Test: m
Test: Device boots
Test: m cts && cts-tradefed run commandAndExit cts-dev --module CtsContentTestCases -c android.content.cts.SharedPreferencesTest
Change-Id: I872a81ae1a26e1f77aad2a52daf88e093a686ec6
2018-01-03 17:58:44 -08:00
Andreas Gampe
383f4f397b Revert "Frameworks: Silently ignore InterruptedException"
This reverts commit c8d5fc8572.

In preparation for different fix.

Bug: 67986472
Bug: 70122540
Bug: 71533447
Test: m
Test: Device boots
Test: m cts && cts-tradefed run commandAndExit cts-dev --module CtsContentTestCases -c android.content.cts.SharedPreferencesTest
Change-Id: I0b9e72d271725e15c20b68de981303c96ac1bd2a
2018-01-03 17:58:39 -08:00
Qingxi Li
cc6ad8cab7 Add API to get eUICC's OTA status
The function will return current eUICC's OTA status and requests calling
app has WRITE_EMBEDDED_SUBSCRIPTIONS.

Test: E2E
Bug: 37279356
Change-Id: I823ed7aa9d86530c4bebd4c0b1a00f0c607105ed
2018-01-03 12:42:01 -08:00
Malcolm Chen
2bac68a635 Merge "Move Ims related settings from global setting to subscription db." am: f2ebbd1356
am: 5bf5c028f7

Change-Id: Iab3a7a47da5961471bce7a8e29960ab75e68719b
2018-01-03 20:04:37 +00:00
Treehugger Robot
f2ebbd1356 Merge "Move Ims related settings from global setting to subscription db." 2018-01-03 19:42:24 +00:00
hj.seo
35d0ac5e07 Merge "Modify getting of primary storage size" am: 1c876b73b3
am: f8adea8255

Change-Id: I291fef4af5af22160952be48415463619d300ff2
2018-01-03 01:29:57 +00:00
Treehugger Robot
1c876b73b3 Merge "Modify getting of primary storage size" 2018-01-03 01:10:49 +00:00
Malcolm Chen
372da16813 Move Ims related settings from global setting to subscription db.
Bug: 66699661
Test: Manual

Change-Id: Id0d7795401f120b6a8704304a368d926a6610395
Merged-In: Id0d7795401f120b6a8704304a368d926a6610395
2017-12-28 01:03:23 +00:00
Andreas Gampe
906d0c9375 Merge "Binder: Log a histogram of binder proxies to logcat on death" am: 4b7abe301c
am: 3c57709e70

Change-Id: I322ced9619f9982182c5b739007988fda89c6f30
2017-12-27 20:24:50 +00:00
Andreas Gampe
3fc030f083 Binder: Log a histogram of binder proxies to logcat on death
To help investigate potential BinderProxy leaks, attempt to log a
histogram of BinderProxy descriptors to the logcat before asserting.

Bug: 71353150
Test: m
Change-Id: I47313814160678369b15e7dc5851d8096c286b9d
2017-12-27 09:30:45 -08:00
hj.seo
e82e89ef90 Modify getting of primary storage size
Settings application shows internal storage size using API getTotalBytes in StorageStatsManager.
This API calls getPrimaryStorageSize() in StorageManager.
getPrimaryStorageSize() returns /data parition size calculated API roundStorageSize() in FileUtils.
Using this API, total primary storage size returns 8GB if 16GB emmc size device has /data partition size below 8GB.
So we should modify getting of primary storage size close to real emmc size.
getPrimaryStorageSize() will be calculated sum of /data and /system partition size.

Test: Check primary storage size in Settings application

Change-Id: I3ad33534b1c55d09afbb0e9be1c408c02c442842
Signed-off-by: hj.seo <hj.seo@lge.com>
2017-12-26 09:24:53 +09:00
Hall Liu
effcd1f508 Merge "Add feature flag and EMBMS bug fixes" am: 465f2916e0
am: 3424136a59

Change-Id: Iebc092e58752f32b6abfad612901ae094e083449
2017-12-22 00:54:14 +00:00
Hall Liu
465f2916e0 Merge "Add feature flag and EMBMS bug fixes" 2017-12-22 00:37:31 +00:00
Andrew Solovay
4adbc6b5b0 Merge "DO NOT MERGE docs: Removing spurious end </pre> tag" into oc-mr1-dev
am: acc55e61dd

Change-Id: I35d0f71a7da2dcae3ed3bab4aa111290ea4c4c60
2017-12-21 22:55:33 +00:00
Hall Liu
51c68e6570 Merge "Add feature flag for RTT in call log" am: 138d07f82d
am: 9a5e663d97

Change-Id: Ibdf102659e079844e81faac327b0d9cfb3b0d9de
2017-12-21 22:47:29 +00:00
Hansong Zhang
f3caa4dc5a Merge "BluetoothHidDevice: rename onIntrData to onInterruptData (1/5)" am: 045fdae1b3
am: d6c2722094

Change-Id: I7ef265d36f4a42e7e9a74e63e8b343b28b63c8b3
2017-12-21 22:31:53 +00:00
Hall Liu
138d07f82d Merge "Add feature flag for RTT in call log" 2017-12-21 22:31:45 +00:00
Treehugger Robot
045fdae1b3 Merge "BluetoothHidDevice: rename onIntrData to onInterruptData (1/5)" 2017-12-21 21:56:10 +00:00
Andrew Solovay
8acb2e1342 DO NOT MERGE docs: Removing spurious end </pre> tag
Owing to a merge mixup, ended up adding a spurious </pre> where it
had no effect. Removing it just for hygiene's sake.

This doc error is only in oc-mr1-dev, not in master, so the fix
doesn't need to be merged.

Test: make ds-docs
Bug: 70812346
Change-Id: I5b54ed8fb1f068698d4dd4536383b52165b4d81f
2017-12-21 19:25:49 +00:00
Chenbo Feng
09a81e4da1 Merge "Use NetworkStatsService to get stats for apps" am: 693d8a2ab1
am: fa7f4015fc

Change-Id: I14f614a86214bd4f006415c48b9a8323e06c737f
2017-12-21 19:15:29 +00:00
Andrew Solovay
7ad3eb8db0 Merge "doc: Fixing Javadoc formatting problems." into oc-mr1-dev
am: 7835c650b2

Change-Id: I662ac186b079d88fc503fa546b52b1297b98a036
2017-12-21 17:42:46 +00:00
Hansong Zhang
b06bb2186a BluetoothHidDevice: rename onIntrData to onInterruptData (1/5)
Bug: 63384609
Test: make
Merged-In: I3b55f7383d2a84162d681ebf3740ddc9e8a55bbb
Change-Id: I3b55f7383d2a84162d681ebf3740ddc9e8a55bbb
(cherry picked from commit 42324278bf)
2017-12-20 11:10:53 -08:00
Andrew Solovay
0472643736 doc: Fixing Javadoc formatting problems.
No code changes, just fixing typos in the doc comments.

Doc is staged to:

http://go/dac-stage/reference/android/service/autofill/AutofillService.html
http://go/dac-stage/reference/android/service/autofill/FillRequest.html

Test: make ds-docs
Bug: 70812346
Merged-In: Ia76121c60197275c6be1717c8003fe1c4baf5f97
Change-Id: I5ee04bb96234441c5740665540b5e803fcf9710f
2017-12-20 18:08:46 +00:00
Chenbo Feng
d3d9c4ed9b Use NetworkStatsService to get stats for apps
Move the native implementation of TrafficStats to NetworkStatsService
and apps need to get the NetworkStatsService binder interface from
system_server in order to get the network usage stats since boot. This
implementation can hide the detail of retrieving network traffic
information from apps and the NetworkStatsService can choose which
methoed it use to get the data depending on the kernel version of the
device.

Bug: 30950746
Test: CtsNetTestCases -t android.net.cts.TrafficStatsTest
Change-Id: I53bbefd19aa0b783b9b4b42ea4d76db3e9ec07a3
2017-12-19 19:57:44 -08:00
Benedict Wong
9de5c77303 Merge "[ipsec-qtaguid] Tag sockets upon creation of encap sockets" am: d0ac50bcad
am: 8caa274ade

Change-Id: I2f27c76a1f493ff4f0bd423c06f159e629866d4d
2017-12-19 00:27:57 +00:00
Hugo Benichi
fe9e89820d Merge changes I798d8fec,I4a2d5866 am: c5212b6654
am: 99be302c71

Change-Id: I41b507c4e4bf9b8b9082f5e7eaab8985b5bbef41
2017-12-19 00:06:00 +00:00
Benedict Wong
d0ac50bcad Merge "[ipsec-qtaguid] Tag sockets upon creation of encap sockets" 2017-12-18 23:50:52 +00:00
Hugo Benichi
c5212b6654 Merge changes I798d8fec,I4a2d5866
* changes:
  MacAddress: address api review comments
  Expose the MacAddress class in the api
2017-12-18 23:43:06 +00:00
Android Build Merger (Role)
11448df5a1 Merge "Merge "[CHERRY-PICK] API for apps to tag sockets with their own UID." am: bef8c59634 am: 826657a9c2" into oc-mr1-dev-plus-aosp 2017-12-18 21:57:05 +00:00
Benedict Wong
570970f6b2 Merge "[CHERRY-PICK] API for apps to tag sockets with their own UID." am: bef8c59634
am: 826657a9c2

Change-Id: Ia06653e6c1cccddcd2de17dd88a9ef47263f5c79
2017-12-18 21:56:41 +00:00
Kevin Hufnagle
6f2f0f639b docs: Touch-up edits to ShortcutManager class reference.
am: 4777f37f78

Change-Id: Ibc90a8a2771a3e9fe5e59398be986b75490c60c2
2017-12-18 21:55:02 +00:00
Benedict Wong
babe5d7364 [ipsec-qtaguid] Tag sockets upon creation of encap sockets
Added calls to tag encap sockets to that of the UID for which the encap
socket is being created on behalf of. This ensures that all data
accounting generated for the UDP-encap-ESP socket is correctly billed to
the right UID.

Bug: 62994731
Test: New tests added to IpSecServiceTest.java, passing
Change-Id: I15365ea9c982fd7b4e3cdeff314ddfba2289c86e
2017-12-18 19:46:06 +00:00
Jeff Sharkey
a4239cf798 [CHERRY-PICK] API for apps to tag sockets with their own UID.
This enables app A to create a socket, pass it to app B, and have
app B accept blame for the traffic performed on that socket.

Also adds helpful public APIs for tagging raw FileDescriptor sockets
instead of making developers go through shady SocketImpl wrappers.

Test: cts-tradefed run commandAndExit cts-dev -m CtsAppSecurityHostTestCases -t android.appsecurity.cts.AppSecurityTests#testAppFailAccessPrivateData
Bug: 63932076
Change-Id: I08925c843974675fc82e4080cec2eaab9ab7cd41
Merged-In: I08925c843974675fc82e4080cec2eaab9ab7cd41
(cherry picked from commit 70dc4f4d16)
2017-12-18 19:44:40 +00:00
Kevin Hufnagle
4777f37f78 docs: Touch-up edits to ShortcutManager class reference.
Test: make ds-docs -j16

Bug: 64727234
Change-Id: Ieb2c2f6ee6706f206e2cc0d5be8bc3a5cdd9f345
2017-12-18 10:47:58 -08:00
Hansong Zhang
cab953250f Merge "Publish Bluetooth HID Device Profile Service API" am: fbd4ea125f
am: 6047c90e9b

Change-Id: Icd57d9a0d70bd4bc0dfe1396335254ccef9528b4
2017-12-18 18:06:19 +00:00
Kevin Hufnagle
87ce35c371 Merge "docs: Revised wording, section order for ShortcutManager API ref." into oc-mr1-dev
am: d642148c84

Change-Id: Iabb204baf3772b44b6852ec9d7135db0baf228bc
2017-12-18 17:52:36 +00:00
Treehugger Robot
fbd4ea125f Merge "Publish Bluetooth HID Device Profile Service API" 2017-12-18 17:47:35 +00:00
Kevin Hufnagle
d642148c84 Merge "docs: Revised wording, section order for ShortcutManager API ref." into oc-mr1-dev 2017-12-18 17:42:48 +00:00
Hugo Benichi
a0ecf38d30 MacAddress: address api review comments
1) toSafeString() is renamed to toOuiString()
2) toOuiString() returns a String that only contains the first 3 bytes
   of the mac address.

Bug: 70336442
Test: runtest frameworks-net
Change-Id: I798d8fec32dbff5687a682028e5d90eb941f81c1
2017-12-18 09:22:47 +09:00
Hugo Benichi
3f4848102c Expose the MacAddress class in the api
Test: built,  flashed, $ runtest frameworks-net
Bug: 69390696
Change-Id: Ica5efdf5ffe8ad2500a87f574508a2bcd074b33d
Merged-In: Ica5efdf5ffe8ad2500a87f574508a2bcd074b33d

(cherry picked from commit d411cf61ed)
2017-12-18 09:21:26 +09:00
Hansong Zhang
88f3891d1e Publish Bluetooth HID Device Profile Service API
Enable the BluetoothHidDevice API in framework.

Bug: 63384609
Test: SL4A HID test; test with apps using BluetoothHidDevice
Merged-In: I52ca4674f11179f865bdff22e0289dfe893c40f5
Change-Id: I52ca4674f11179f865bdff22e0289dfe893c40f5
(cherry picked from commit 7bb587d72b)
2017-12-15 16:12:00 -08:00