Commit Graph

75693 Commits

Author SHA1 Message Date
Hans Boehm
f81791c141 Merge "Only count uncleared ProxyMap refs when deciding to crash" am: 90027eb1c2
am: c9e7c10afb

Change-Id: I70169c5eeb5dbdaa751ea7b9369feb3663d79952
2018-01-09 19:38:55 +00:00
Hans Boehm
d2fb7df2c1 Only count uncleared ProxyMap refs when deciding to crash
Add a method to compute the size of a ProxyMap without cleared
references. Use it in the crash decision. Report both counts, as
well as the count after a forced GC before actually crashing.

Rename the histogram generating function after a small refactoring
to make that easier.

When we crash, we now generate a message like the following
(generated here with reduced thresholds):

01-03 01:40:52.273  4793  4947 E JavaBinder: java.lang.AssertionError:
Binder ProxyMap has too many entries: 277 (total), 275 (uncleared),
257 (after GC). BinderProxy leak?

after the histogram. Unfortunately, the intervening GC may take some
time, and other intervening messages may sneak into the log between
them.

Experiments so far suggest that none of this greatly affects the
decision when to die. But this eliminates uncertainty as to whether
there was really a problem.

Bug: 71353150

Test: Tested with reduced thresholds, and then booted AOSP.
Change-Id: I53f24bae23eedcdb78a1c32296c65692b7bb2c42
2018-01-08 14:30:42 -08:00
Toby Sargeant
ef5218836d Merge "Add a Java FindAddress implentation." am: 9ea410a6f8
am: da4e3b68fb

Change-Id: I7b2448fcb2edb4bc9000fd5e55f7295e6c6ff676
2018-01-08 21:23:45 +00:00
Jack He
b1ebd51c01 Merge changes from topics "bt-hfp-add-set-active-device-method", "bt-system-api-annotations" am: 25259faa27
am: d16d93361b

Change-Id: I525cbc81c450afafd3fcedaf7b1b5e4b17a4162a
2018-01-08 21:13:52 +00:00
Pavlin Radoslavov
fe73dd0542 Merge "Added internal API to get/set the A2DP Active Device" am: 6efee9c079
am: e3428dae04

Change-Id: If220447db71398cc305eb7a702896e21959110c8
2018-01-08 21:02:01 +00:00
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
Toby Sargeant
9ea410a6f8 Merge "Add a Java FindAddress implentation." 2018-01-08 12:05:12 +00:00
Jack He
05f4bc4074 HFP: Add APIs for set and get active device (1/3)
1. Call BluetoothHeadset.setActiveDevice(BluetoothDevice device) to set
   a connected HFP/HSP device as active.
2. Listen for BluetoothHeadset.ACTION_ACTIVE_DEVICE_CHANGED intent
   that will contain the latest active device (in EXTRA_DEVICE field).
   If the active device could not be changed, the EXTRA_DEVICE
   field could be null.
3. If setActiveDevice() is NOT in-progress, BluetoothA2dp.getActiveDevice()
   can be used. If setActiveDevice() is in-progress, the result is undefined.
4. BluetoothHeadset.setActiveDevice() could be called by some other parts of
   the system, so interested parties should always listen for
   BluetoothHeadset.ACTION_ACTIVE_DEVICE_CHANGED intents and prepared
   for active device updates.

Bug: 68951996
Test: manual
Change-Id: I22ca639a04fed7bf17df59c405ddeda90dafb8ff
2018-01-05 14:51:40 -08:00
Selim Gurun
4029fa6039 Add SystemApis annotations
There are some number of places where bluetooth APIs are used via
reflection from GMSCore. Add proper annotations.

Bug: 67052734
Test: Manual - and using make update-api
Change-Id: Ib6e3aa1ff5b6f9cdc78367f9be13ed00542d6f65
(cherry picked from commit 64bd35ef2c)
2018-01-05 14:50:30 -08:00
Pavlin Radoslavov
64a9435cc7 Added internal API to get/set the A2DP Active Device
1. Call BluetoothA2dp.setActiveDevice(BluetoothDevice device) to set
   a connected A2DP device as active.
   The value of "device" could be null to clear the active device
   and stop streaming audio to a Bluetooth device.
2. Listen for BluetoothA2dp.ACTION_ACTIVE_DEVICE_CHANGED intent
   that will contain the latest active device (in EXTRA_DEVICE field).
   If the active device could not be changed, the EXTRA_DEVICE
   field could be null.
3. If setActiveDevice() is NOT in-progress, BluetoothA2dp.getActiveDevice()
   can be used. If setActiveDevice() is in-progress, the result is undefined.
4. BluetoothA2dp.setActiveDevice() could be called by some other parts of
   the system, so interested parties should always listen for
   BluetoothA2dp.ACTION_ACTIVE_DEVICE_CHANGED intents and prepared
   for active device updates.

Bug: 71555243
Test: Manual
Change-Id: I661b6882e8e6b437db50210aec1dd12a10199969
2018-01-05 21:44:59 +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
Tobias Sargeant
f4d85d806e Add a Java FindAddress implentation.
This stops calling findAddress (possibly indirectly via Linkify) from
loading webview native code, resulting in a performance and memory
improvement for those apps that call WebView#findAddress but do not
otherwise use WebView.

Bug: 22362008
Test: Existing WebView CTS test.
Change-Id: I5fcab725ceaf0d6a00e931d3b6cd2f3799d68391
2018-01-05 14:44:10 +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