OSDN Git Service
TreeHugger Robot [Wed, 18 Jul 2018 19:01:35 +0000 (19:01 +0000)]
Merge "Fix race condition in BoundsAnimationController"
TreeHugger Robot [Wed, 18 Jul 2018 18:33:31 +0000 (18:33 +0000)]
Merge "Include textclassifier info in dumpsys"
Aurimas Liutikas [Wed, 18 Jul 2018 18:26:16 +0000 (11:26 -0700)]
[automerger skipped] Merge "libmedia2_jni: use libbinder as shared library" into stage-aosp-master am:
43a71788b4 -s ours
am:
6a92823603 -s ours
Change-Id: Iafe2c8bedd83e73a00a868f8ec0bdb1a92d1e194
Aurimas Liutikas [Wed, 18 Jul 2018 18:16:42 +0000 (11:16 -0700)]
[automerger skipped] Merge "libmedia2_jni: use libbinder as shared library" into stage-aosp-master
am:
43a71788b4 -s ours
Change-Id: Icaec5a4ab662f5bbf240ad2f21756a3a1a697cef
Aurimas Liutikas [Wed, 18 Jul 2018 18:06:15 +0000 (18:06 +0000)]
Merge "libmedia2_jni: use libbinder as shared library" into stage-aosp-master
Yifan Hong [Wed, 18 Jul 2018 17:52:35 +0000 (10:52 -0700)]
[automerger skipped] Merge "IBatteryPropertiesRegistrar: remove unused functions" into stage-aosp-master am:
b9fa97dff7
am:
d8fe7f5796 -s ours
Change-Id: I94f76a0f575fcc36ccf9444ba4bc93c667ea3b4e
Phil Weaver [Wed, 18 Jul 2018 17:40:15 +0000 (17:40 +0000)]
Merge "Fix a11y cache correctness bug"
Yifan Hong [Wed, 18 Jul 2018 17:38:42 +0000 (10:38 -0700)]
Merge "IBatteryPropertiesRegistrar: remove unused functions" into stage-aosp-master
am:
b9fa97dff7
Change-Id: I55e25e25612cbb11cec025ba21b6577d635f1df9
Steven Moreland [Wed, 18 Jul 2018 17:32:21 +0000 (10:32 -0700)]
[automerger skipped] libmedia2_jni: use libbinder as shared library
am:
121551621e -s ours
Change-Id: Ic13f83bc071b31ae6f431a033596eaf376477790
Yifan Hong [Wed, 18 Jul 2018 17:25:51 +0000 (17:25 +0000)]
Merge "IBatteryPropertiesRegistrar: remove unused functions" into stage-aosp-master
TreeHugger Robot [Wed, 18 Jul 2018 17:23:31 +0000 (17:23 +0000)]
Merge "Annotate Point/PointF with nullability annotations"
Steven Moreland [Tue, 17 Jul 2018 17:11:34 +0000 (10:11 -0700)]
libmedia2_jni: use libbinder as shared library
In order to prevent prebuilts from freezing the libbinder
internal API (the wire protocol), it is being made a
shared-only library.
Bug:
111454508
Test: m only
Change-Id: If7f8bd931dae5310eda6c230f20179418c2efa43
(cherry picked from commit
a192e0e31400ac5a2b9d69788c7a60a89fb6c6ed)
Merged-In: If7f8bd931dae5310eda6c230f20179418c2efa43
Steven Moreland [Tue, 17 Jul 2018 17:11:34 +0000 (10:11 -0700)]
libmedia2_jni: use libbinder as shared library
In order to prevent prebuilts from freezing the libbinder
internal API (the wire protocol), it is being made a
shared-only library.
Bug:
111454508
Test: m only
Change-Id: If7f8bd931dae5310eda6c230f20179418c2efa43
(cherry picked from commit
a192e0e31400ac5a2b9d69788c7a60a89fb6c6ed)
Merged-In: If7f8bd931dae5310eda6c230f20179418c2efa43
Fredrik Roubert [Wed, 18 Jul 2018 16:42:38 +0000 (09:42 -0700)]
Merge "API updated for ICU4J 62.1" am:
e0ec160120 am:
46c84f53a6
am:
edf0baea40
Change-Id: I1b1f33db8f1fd3171edbf871e87501570b4673ad
Fredrik Roubert [Wed, 18 Jul 2018 16:29:20 +0000 (09:29 -0700)]
Merge "API updated for ICU4J 62.1" am:
e0ec160120
am:
46c84f53a6
Change-Id: Iea40f55aecdf1f469eeca68570087ccc66ce23c7
eddy-sh.chen [Wed, 18 Jul 2018 16:24:19 +0000 (09:24 -0700)]
[automerger skipped] Merge "[DO NOT MERGE] Do not dismiss volume dialog onAnimationEnd while dialog is showing" am:
2e08b42aff -s ours am:
369f587942 -s ours
am:
2958f315c5 -s ours
Change-Id: I5030d05d5953034d9253abd8b8534d40a083f7e5
eddy-sh.chen [Wed, 18 Jul 2018 16:19:01 +0000 (09:19 -0700)]
[automerger skipped] Merge "[DO NOT MERGE] Do not dismiss volume dialog onAnimationEnd while dialog is showing" am:
2e08b42aff -s ours
am:
369f587942 -s ours
Change-Id: Ie55857ab5d91d5ffd6d488a45f9859ec9cfbbe9f
Fredrik Roubert [Wed, 18 Jul 2018 16:18:46 +0000 (09:18 -0700)]
Merge "API updated for ICU4J 62.1"
am:
e0ec160120
Change-Id: I19144ce1a0fd7d0a9781a71ebacec033a8affb19
eddy-sh.chen [Wed, 18 Jul 2018 16:14:47 +0000 (09:14 -0700)]
[automerger skipped] Merge "[DO NOT MERGE] Do not dismiss volume dialog onAnimationEnd while dialog is showing"
am:
2e08b42aff -s ours
Change-Id: Ia000091649425fa1d1a2895ecc6a7f0f96157337
Jake Wharton [Tue, 5 Jun 2018 16:47:13 +0000 (12:47 -0400)]
Annotate Point/PointF with nullability annotations
And a missing override or four.
Bug:
78245676
Test: none
Change-Id: I0293eaeb4ec9659b8ee09ac29351f995bb166dbc
Treehugger Robot [Wed, 18 Jul 2018 15:03:59 +0000 (15:03 +0000)]
Merge "API updated for ICU4J 62.1"
Treehugger Robot [Wed, 18 Jul 2018 14:59:20 +0000 (14:59 +0000)]
Merge "[DO NOT MERGE] Do not dismiss volume dialog onAnimationEnd while dialog is showing"
David Brazdil [Wed, 18 Jul 2018 13:18:55 +0000 (06:18 -0700)]
[automerger skipped] Merge "[DO NOT MERGE] Update P light greylist in AOSP" am:
21593137ac -s ours am:
2abea6bc94 -s ours
am:
36c25a5c93 -s ours
Change-Id: Id8e846e4ddce700a6e811a6700794f80d119938c
David Brazdil [Wed, 18 Jul 2018 13:14:52 +0000 (06:14 -0700)]
[automerger skipped] Merge "[DO NOT MERGE] Update P light greylist in AOSP" am:
21593137ac -s ours
am:
2abea6bc94 -s ours
Change-Id: Ifc02a70713a1dcaad612ec99684b60ce9dc12c7c
David Brazdil [Wed, 18 Jul 2018 13:10:27 +0000 (06:10 -0700)]
[automerger skipped] Merge "[DO NOT MERGE] Update P light greylist in AOSP"
am:
21593137ac -s ours
Change-Id: I8bb94ce755d710460fcd74d2f8d4ab0d198ba533
Fredrik Roubert [Tue, 5 Jun 2018 04:28:49 +0000 (21:28 -0700)]
API updated for ICU4J 62.1
- ICU 62 upgrades to Unicode 11. Add new APIs for Unicode 11.0
Bug:
109930825
Bug:
109837373
Test: make
Change-Id: I3f23bbe624a10511a613cb07fd35e8272d1461a2
Jorim Jaggi [Wed, 18 Jul 2018 12:17:26 +0000 (05:17 -0700)]
Merge "Repin home once setup is complete" into pi-dev am:
31e9d9d32b
am:
106ae23742
Change-Id: Ifb4856b92c21146a4326a52112745b6b16822cb6
Jorim Jaggi [Wed, 18 Jul 2018 12:09:42 +0000 (05:09 -0700)]
Merge "Repin home once setup is complete" into pi-dev
am:
31e9d9d32b
Change-Id: Iab49d0893ae591c78334a49c33f153ecab3f0239
TreeHugger Robot [Wed, 18 Jul 2018 11:59:59 +0000 (11:59 +0000)]
Merge "Use Base64 from android.util in LocalTransport"
Jorim Jaggi [Wed, 18 Jul 2018 11:57:08 +0000 (11:57 +0000)]
Merge "Repin home once setup is complete" into pi-dev
David Brazdil [Wed, 18 Jul 2018 11:49:00 +0000 (11:49 +0000)]
Merge "[DO NOT MERGE] Update P light greylist in AOSP"
David Brazdil [Wed, 18 Jul 2018 09:29:10 +0000 (10:29 +0100)]
[DO NOT MERGE] Update P light greylist in AOSP
Publish the final light greylist of P for external developers.
Test: N/A
Change-Id: I5513ee2ee555bf1dced7f52b36de3df7ac85747a
Tony Mak [Mon, 16 Jul 2018 12:46:29 +0000 (14:46 +0200)]
Include textclassifier info in dumpsys
Example output:
Text classifier constants=null
TextClassifierImpl:
Model file(s):
ModelFile { path=/data/misc/textclassifier/textclassifier.model name=textclassifier.model version=603 locales=en }
ModelFile { path=/etc/textclassifier/textclassifier.universal.model name=textclassifier.universal.model version=6 locales=und }
ModelFile { path=/etc/textclassifier/textclassifier.en.model name=textclassifier.en.model version=6 locales=en }
mFallback=android.view.textclassifier.TextClassifier$1@8269b3
SystemTextClassifier:
mFallback=android.view.textclassifier.TextClassifierImpl@
72dbb70 mPackageName=android mSessionId=null isSystemTextClassifierEnabled=true
TextClassificationConstants:
isLocalTextClassifierEnabled=true isSystemTextClassifierEnabled=true isModelDarkLaunchEnabled=false isSmartSelectionEnabled=true isSmartTextShareEnabled=true isSmartLinkifyEnabled=true isSmartSelectionAnimationEnabled=true getSuggestSelectionMaxRangeLength=10000 getClassifyTextMaxRangeLength=10000 getGenerateLinksMaxTextLength=100000 getGenerateLinksLogSampleRate=100 getEntityListDefault=[address, email, phone, url, date, datetime, flight] getEntityListNotEditable=[address, email, phone, url, date, datetime, flight] getEntityListEditable=[address, email, phone, url, date, datetime, flight]
FIXES:
111434669
Test: adb shell dumpsys textclassification
Change-Id: If0cbc290034ff51ec31fed1ce08e5bc806603549
TreeHugger Robot [Wed, 18 Jul 2018 07:57:08 +0000 (07:57 +0000)]
Merge "Fix double close in NativeLibraryHelper.openApkFd."
Sudheer Shanka [Wed, 18 Jul 2018 05:03:12 +0000 (05:03 +0000)]
Merge "Fix potential crash when per-procstate cpu times tracking is turned on."
eddy-sh.chen [Mon, 16 Jul 2018 06:12:04 +0000 (14:12 +0800)]
[DO NOT MERGE] Do not dismiss volume dialog onAnimationEnd while dialog is showing
Bug:
80362864
Bug:
111478851
Change-Id: Iec6e27285bf35238d378e6561896f1d0b303fa24
Amith Yamasani [Wed, 18 Jul 2018 01:20:59 +0000 (18:20 -0700)]
[automerger skipped] Merge "Fix for incorrect cycle evaluation in computeOomAdj DO NOT MERGE" into pi-dev am:
9d77aaec85
am:
39935ebb52 -s ours
Change-Id: I6cd0d6b6e78b2036f584a9d0270c5d6b08eb29ad
Josh Gao [Tue, 17 Jul 2018 22:00:31 +0000 (15:00 -0700)]
Fix double close in NativeLibraryHelper.openApkFd.
Prior to this patch, we were taking the file descriptor owned by a
ParcelFileDescriptor, and passing it into ZipFileRO::openFd, which
expects to take ownership of the file descriptor, closing it upon
destruction. This leads to a double-close when the ParcelFileDescriptor
tries to close itself. Switch to passing a duped copy of the file
descriptor to ZipFileRO::openFd.
Test: `pm install foo.apk` with fdsan
Change-Id: Ida4ca4a37b82875dc4eef1f37bf2322c422fe038
Amith Yamasani [Wed, 18 Jul 2018 01:13:38 +0000 (18:13 -0700)]
Merge "Fix for incorrect cycle evaluation in computeOomAdj DO NOT MERGE" into pi-dev
am:
9d77aaec85
Change-Id: Ie4e65d42c44a2a45418f5bd27155efc6c4869276
TreeHugger Robot [Wed, 18 Jul 2018 01:07:21 +0000 (01:07 +0000)]
Merge "Add SUSPEND_APPS permission to shell"
TreeHugger Robot [Wed, 18 Jul 2018 00:56:18 +0000 (00:56 +0000)]
Merge "Fix for incorrect cycle evaluation in computeOomAdj DO NOT MERGE" into pi-dev
Kazuki Takise [Tue, 17 Jul 2018 23:56:21 +0000 (23:56 +0000)]
Merge "Defer always on top state when task gets maximized"
Winson Chung [Mon, 16 Jul 2018 19:42:37 +0000 (12:42 -0700)]
Fix race condition in BoundsAnimationController
- The SfVsyncFrameCallbackProvider needs to be initialized with the
associated handler thread's Choreographer instance.
Bug:
111465953
Test: Take a systrace and ensure the animation is running on the right
thread
Change-Id: Ia70b09d391fd2d154e00d081cfcf0d2354e51db2
Phil Weaver [Tue, 17 Jul 2018 19:28:24 +0000 (12:28 -0700)]
Fix a11y cache correctness bug
If two views change, their common ancestor can send
a subtree_changed event. But the cache is dropping
events that come from views that it hasn't cached.
Now clearing the cache entirely when a node not in
the cache sends a subtree changed event, since we
don't know which nodes are descendents and which
may have changed.
I'm not thrilled with this change, since it may
degrade performance, but I want to fix the correctness
problem quickly.
Bug:
111554539
Test: atest AccessibilityCacheTest
Change-Id: Ib32d3622cddd7001663943eff71e823d21f5e500
Tyler Gunn [Tue, 17 Jul 2018 22:36:23 +0000 (15:36 -0700)]
[automerger skipped] Merge "Ensure Notification re-post with setOnlyAlertOnce(true) silences sound." am:
bbe8990162 -s ours am:
9bc17a66e6
am:
72e042db9d -s ours
Change-Id: Iaedfd0ee40d32f7b040ae0e9871a8f3d8aab552d
Yifan Hong [Fri, 4 May 2018 20:48:31 +0000 (13:48 -0700)]
IBatteryPropertiesRegistrar: remove unused functions
* Remove BatteryProperties
* Remove IBatteryPropertiesListener
* Remove IBatteryPropertiesRegistrar.(un)registerListener
functions
Test: builds
Test: boots
Bug:
68724651
Change-Id: Ic9a9d337e5cb39784db1a2745297ef985dd31653
Merged-In: Ic9a9d337e5cb39784db1a2745297ef985dd31653
(cherry picked from commit
dd0e942597b51e517eb65d9ea80595d46a3e89df)
Tyler Gunn [Tue, 17 Jul 2018 22:26:49 +0000 (15:26 -0700)]
[automerger skipped] Merge "Ensure Notification re-post with setOnlyAlertOnce(true) silences sound." am:
bbe8990162 -s ours
am:
9bc17a66e6
Change-Id: I3bd5ec5a2867f02f02fdbb906bc2323e8724c6e6
TreeHugger Robot [Tue, 17 Jul 2018 22:22:27 +0000 (22:22 +0000)]
Merge "Create night version of resources for dark theme"
Tyler Gunn [Tue, 17 Jul 2018 22:16:41 +0000 (15:16 -0700)]
[automerger skipped] Merge "Ensure Notification re-post with setOnlyAlertOnce(true) silences sound."
am:
bbe8990162 -s ours
Change-Id: Ic8cd7c12d58d9f75b1d952a7e9fca6cbe3f8fb33
TreeHugger Robot [Tue, 17 Jul 2018 22:10:21 +0000 (22:10 +0000)]
Merge "Use quick_qs_total_height when QS is not disabled"
Jerry Zhang [Tue, 17 Jul 2018 22:09:35 +0000 (15:09 -0700)]
Merge "UsbDescriptor: Add finite timeout to control transfer" am:
20dca26f41 am:
4bff76be80
am:
db3a291e9d
Change-Id: Ibf2bc0673e156919baf77c0db2033aa521b08052
Jerry Zhang [Tue, 17 Jul 2018 22:00:31 +0000 (15:00 -0700)]
Merge "UsbDescriptor: Add finite timeout to control transfer" am:
20dca26f41
am:
4bff76be80
Change-Id: Ie89d8a02c4e92e4d7d2372fad29abdba0c2fc568
Hongming Jin [Tue, 17 Jul 2018 21:33:20 +0000 (21:33 +0000)]
Merge "Revoke permissions defined in a to-be removed package."
TreeHugger Robot [Tue, 17 Jul 2018 21:11:35 +0000 (21:11 +0000)]
Merge "libmedia2_jni: use libbinder as shared library"
Suprabh Shukla [Mon, 16 Jul 2018 20:23:21 +0000 (13:23 -0700)]
Add SUSPEND_APPS permission to shell
Since this permission protects system apis, this is required for
instrumentation tests.
Test: atest com.google.android.suspendapps.gts.SuspendPackagesTest
Bug:
79773970
Change-Id: Ib283018c50cc19c3958bd61e2d19befbf2805cc5
Jerry Zhang [Tue, 17 Jul 2018 20:59:15 +0000 (13:59 -0700)]
Merge "UsbDescriptor: Add finite timeout to control transfer"
am:
20dca26f41
Change-Id: I86a916694a497bedb7d2df8a64dd17e0e15ce332
Tyler Gunn [Tue, 17 Jul 2018 20:29:59 +0000 (20:29 +0000)]
Merge "Ensure Notification re-post with setOnlyAlertOnce(true) silences sound."
Jeff Sharkey [Tue, 17 Jul 2018 20:01:51 +0000 (20:01 +0000)]
Merge "Handle new current.txt format."
Jeff Sharkey [Tue, 17 Jul 2018 19:29:40 +0000 (13:29 -0600)]
Handle new current.txt format.
We're starting to see "@interface" show up, so handle them like any
other interface. We're also seeing more details argument lists
with names and annotations; ignore them for now, since all our
existing lint checks work on the "real" data type.
Verified that it handles new support library current.txt files
without causing any regressions against existing framework
current.txt files.
Test: manual inspection
Bug:
111555356
Change-Id: Id11c3561edd317e4ba1a9b43993fd96d8243e00d
Evan Laird [Tue, 17 Jul 2018 19:55:40 +0000 (15:55 -0400)]
Use quick_qs_total_height when QS is not disabled
A change in the logic of QuickStatusBarHeader#updateResources
mistakenly used quick_qs_offset_height for the total height of the qqs
panel instead of quick_qs_total_height. This caused the quick-quick
settings panel to be too short on devices which don't have a large
notch.
Test: visual, on device without a notch
Change-Id: I0deed2560328501e547b04239133e350cdac4ff6
Fixes:
111554577
Jerry Zhang [Tue, 17 Jul 2018 19:47:29 +0000 (19:47 +0000)]
Merge "UsbDescriptor: Add finite timeout to control transfer"
TreeHugger Robot [Tue, 17 Jul 2018 19:43:08 +0000 (19:43 +0000)]
Merge "BatteryStatsHistory needs to public for unit test to work."
Laura Davis [Tue, 17 Jul 2018 18:50:10 +0000 (11:50 -0700)]
Merge "Docs: Removed narrative content." into pi-dev am:
b4f7c414a6
am:
7f05ea78dd
Change-Id: Ibfff8f72707a41936a4259a90d20eda559b44b0d
Laura Davis [Tue, 17 Jul 2018 18:40:15 +0000 (11:40 -0700)]
Merge "Docs: Removed narrative content." into pi-dev
am:
b4f7c414a6
Change-Id: I9b482df22bcef0fd24f6e56e2a4718bef229f4ad
Hongming Jin [Tue, 19 Jun 2018 19:35:37 +0000 (12:35 -0700)]
Revoke permissions defined in a to-be removed package.
Bug:
67319274
Test: run cts-dev --module CtsPermissionTestCases --test android.permission.cts.RemovePermissionTest#permissionShouldBeRevokedIfRemoved
Change-Id: Id23535d6c4d2fcf5c86dc1338af13a561b32154c
John Reck [Tue, 17 Jul 2018 18:29:28 +0000 (11:29 -0700)]
[automerger skipped] Merge "Remove unneeded JNI method" am:
1febe4196e -s ours am:
8f66efbffe -s ours
am:
d9b9a52299 -s ours
Change-Id: Ic2e3ec3bf3ca60cc648196b30422494144972e8c
Tyler Gunn [Tue, 3 Jul 2018 19:38:49 +0000 (12:38 -0700)]
Ensure Notification re-post with setOnlyAlertOnce(true) silences sound.
Where a notification channel has an associated looping sound, it should
be possible to re-post the notification with setOnlyAlertOnce(true) to
cause the notification channel's sound to silence.
When re-posting the notification, this CL fixes an issue where
NotificationManagerService wouldn't call clearSoundLocked to stop playing
the sound, resulting in the notification continuing to playing the sound
associated with the notification channel.
Test: Manual testing, updated unit test
Bug:
110348674
Merged-In: I3ec26f0804bcf59f7356a2329b73ba8ed8f7ea51
Change-Id: I3ec26f0804bcf59f7356a2329b73ba8ed8f7ea51
Laura Davis [Tue, 17 Jul 2018 18:23:09 +0000 (18:23 +0000)]
Merge "Docs: Removed narrative content." into pi-dev
Tyler Gunn [Tue, 17 Jul 2018 18:22:51 +0000 (18:22 +0000)]
Merge "Ensure Notification re-post with setOnlyAlertOnce(true) silences sound."
John Reck [Tue, 17 Jul 2018 18:20:25 +0000 (11:20 -0700)]
[automerger skipped] Merge "Remove unneeded JNI method" am:
1febe4196e -s ours
am:
8f66efbffe -s ours
Change-Id: I463ac35b909cbc3c5b6edeba2b370d4dc233f778
John Reck [Tue, 17 Jul 2018 18:12:31 +0000 (11:12 -0700)]
[automerger skipped] Merge "Remove unneeded JNI method"
am:
1febe4196e -s ours
Change-Id: I3a366342f1a94c34e0815e5941b7b13816a637c8
TreeHugger Robot [Tue, 17 Jul 2018 18:08:31 +0000 (18:08 +0000)]
Merge "DPM: Propagate StrongBox-related exception"
Hui Yu [Tue, 17 Jul 2018 00:03:48 +0000 (17:03 -0700)]
BatteryStatsHistory needs to public for unit test to work.
Otherwise BatteryStatsHistoryTest gets "Illegal class access" error.
Test: atest BatteryStatsHistoryTest.java
Change-Id: I6efc9df24e1fd15cc3cdc4611a65d3e41efa63da
Sudheer Shanka [Tue, 17 Jul 2018 01:00:46 +0000 (18:00 -0700)]
Fix potential crash when per-procstate cpu times tracking is turned on.
When per-procstate cpu times tracking is turned on,
BatteryStatsImpl tries to access mKernelSingleUidTimeReader but
it's possible that mKernelSingleUidTimeReader hasn't been initialized
yet after a reboot and this could lead to a system_server crash.
Bug:
111523951
Test: manual
Change-Id: Id014f23fbe31fed64fba769f14ba4396a003092e
Steven Moreland [Tue, 17 Jul 2018 17:11:34 +0000 (10:11 -0700)]
libmedia2_jni: use libbinder as shared library
In order to prevent prebuilts from freezing the libbinder
internal API (the wire protocol), it is being made a
shared-only library.
Bug:
111454508
Test: m only
Change-Id: If7f8bd931dae5310eda6c230f20179418c2efa43
Ruchi Kandoi [Tue, 17 Jul 2018 17:02:43 +0000 (10:02 -0700)]
Merge "Hide apks not needed for a specific sku" into pi-dev am:
776b4e2dfa
am:
dae7a5ddd1
Change-Id: I3100d4b3187d35fbfdd5edb4e730c1734b5b596c
Treehugger Robot [Tue, 17 Jul 2018 17:00:30 +0000 (17:00 +0000)]
Merge "Remove unneeded JNI method"
Android Build Merger (Role) [Tue, 17 Jul 2018 16:48:08 +0000 (16:48 +0000)]
Merge "Merge "Track OkHttp changes" am:
0083876870 am:
7e6a128ec7 am:
f6e34a96ed"
Neil Fuller [Tue, 17 Jul 2018 16:47:38 +0000 (09:47 -0700)]
Merge "Track OkHttp changes" am:
0083876870 am:
7e6a128ec7
am:
f6e34a96ed
Change-Id: Ia54aa0c10bc96bab0f7df1f93956c925f9bf5e17
John Reck [Tue, 17 Jul 2018 16:46:56 +0000 (16:46 +0000)]
Merge "Expose async & counter publicly"
Ruchi Kandoi [Tue, 17 Jul 2018 16:41:08 +0000 (09:41 -0700)]
Merge "Hide apks not needed for a specific sku" into pi-dev
am:
776b4e2dfa
Change-Id: I1219ddda2808492d84e182c4192e4caee27ba297
Neil Fuller [Tue, 17 Jul 2018 16:32:31 +0000 (09:32 -0700)]
Merge "Track OkHttp changes" am:
0083876870
am:
7e6a128ec7
Change-Id: I8f94f0fa4e29770ccff3531a71552db230cf6bac
TreeHugger Robot [Tue, 17 Jul 2018 16:26:23 +0000 (16:26 +0000)]
Merge "Hide apks not needed for a specific sku" into pi-dev
Neil Fuller [Tue, 17 Jul 2018 16:16:15 +0000 (09:16 -0700)]
Merge "Track OkHttp changes"
am:
0083876870
Change-Id: Id872a519323e5e3237fb708fa7d2d9eeae579650
Jeff Sharkey [Tue, 17 Jul 2018 16:12:14 +0000 (16:12 +0000)]
Merge changes from topic "downloadvuln"
* changes:
Execute "strict" queries with extra parentheses.
Add support for appending standalone phrases.
TreeHugger Robot [Tue, 17 Jul 2018 16:04:15 +0000 (16:04 +0000)]
Merge "Fix TextureView.getBitmap with scale layer transform"
John Reck [Mon, 16 Jul 2018 17:42:35 +0000 (10:42 -0700)]
Expose async & counter publicly
Also add some go-faster to the JNI
Before:
android.os.TracePerfTest:INSTRUMENTATION_STATUS: enabled_mean=13
INSTRUMENTATION_STATUS: enabled_median=13
INSTRUMENTATION_STATUS: enabled_min=13
INSTRUMENTATION_STATUS: enabled_standardDeviation=0
INSTRUMENTATION_STATUS_CODE: -1
.INSTRUMENTATION_STATUS: beginEndSection_mean=3849
INSTRUMENTATION_STATUS: beginEndSection_median=3850
INSTRUMENTATION_STATUS: beginEndSection_min=3829
INSTRUMENTATION_STATUS: beginEndSection_standardDeviation=14
INSTRUMENTATION_STATUS_CODE: -1
.INSTRUMENTATION_STATUS: counter_mean=1836
INSTRUMENTATION_STATUS: counter_median=1837
INSTRUMENTATION_STATUS: counter_min=1832
INSTRUMENTATION_STATUS: counter_standardDeviation=2
INSTRUMENTATION_STATUS_CODE: -1
.INSTRUMENTATION_STATUS: asyncBeginEnd_mean=4992
INSTRUMENTATION_STATUS: asyncBeginEnd_median=4988
INSTRUMENTATION_STATUS: asyncBeginEnd_min=4964
INSTRUMENTATION_STATUS: asyncBeginEnd_standardDeviation=21
INSTRUMENTATION_STATUS_CODE: -1
After:
android.os.TracePerfTest:INSTRUMENTATION_STATUS: enabled_mean=13
INSTRUMENTATION_STATUS: enabled_median=13
INSTRUMENTATION_STATUS: enabled_min=13
INSTRUMENTATION_STATUS: enabled_standardDeviation=0
INSTRUMENTATION_STATUS_CODE: -1
.INSTRUMENTATION_STATUS: beginEndSection_mean=2974
INSTRUMENTATION_STATUS: beginEndSection_median=2971
INSTRUMENTATION_STATUS: beginEndSection_min=2958
INSTRUMENTATION_STATUS: beginEndSection_standardDeviation=15
INSTRUMENTATION_STATUS_CODE: -1
.INSTRUMENTATION_STATUS: counter_mean=1737
INSTRUMENTATION_STATUS: counter_median=1739
INSTRUMENTATION_STATUS: counter_min=1732
INSTRUMENTATION_STATUS: counter_standardDeviation=3
INSTRUMENTATION_STATUS_CODE: -1
.INSTRUMENTATION_STATUS: asyncBeginEnd_mean=3677
INSTRUMENTATION_STATUS: asyncBeginEnd_median=3679
INSTRUMENTATION_STATUS: asyncBeginEnd_min=3663
INSTRUMENTATION_STATUS: asyncBeginEnd_standardDeviation=11
INSTRUMENTATION_STATUS_CODE: -1
Test: builds, benchmarks, verified tracing still works
Bug:
111503982
Change-Id: I71cb026d034bf9b9f97427d10d5ff9ce3d103561
Nandana Dutt [Tue, 17 Jul 2018 14:19:20 +0000 (14:19 +0000)]
Merge "Fix system server leaked fd dump"
Treehugger Robot [Tue, 17 Jul 2018 13:43:10 +0000 (13:43 +0000)]
Merge "Track OkHttp changes"
Stan Iliev [Thu, 12 Jul 2018 20:53:59 +0000 (16:53 -0400)]
Fix TextureView.getBitmap with scale layer transform
Fix TextureView.getBitmap to capture content only from the layer.
Bug:
111401911
Test: A new test TextureViewTest.testTransformScale is passing
Change-Id: I2b9cee17fc48de7b12ed03d5b4f173ce5445dbfe
Bernardo Rufino [Tue, 17 Jul 2018 12:46:20 +0000 (12:46 +0000)]
Merge "Increase PerformBackupTask unit coverage"
Martijn Coenen [Tue, 17 Jul 2018 12:20:30 +0000 (12:20 +0000)]
Merge changes I4e06b3f9,Iffcbbb82,If9dd6913
* changes:
Move proxy debug info dumping back to Java.
Dump top binder proxy interface names in dumpsys.
Make BinderProxy @hide public class.
Eran Messeri [Mon, 9 Jul 2018 16:58:26 +0000 (17:58 +0100)]
DPM: Propagate StrongBox-related exception
When the caller attempts to generate a key via DevicePolicyManager
(using DevicePolicyManager.generateKeyPair), and specifies that
StrongBox should be used, throw the right exception indicating
StrongBox unavailability - the same one that is thrown if the same
parameters were passed to the KeyStore's key generation method.
This is achieved by catching the StrongBoxUnavailableException in
KeyChain, returning an error code indicating this particular failure
to the DevicePolicyManagerService, which then propagates it by
throwing a service-specific exception with a value indicating
StrongBox unavailability.
The DevicePolicyManager then raises StrongBoxUnavailableException.
Prior to this change the exception propagated from KeyChain would be
a generic failure so the caller would simply get a null result.
Bug:
110882855
Bug:
111183576
Bug:
111322478
Test: atest CtsDevicePolicyManagerTestCases:com.android.cts.devicepolicy.MixedDeviceOwnerTest#testKeyManagement
Change-Id: I9abe3f449b48eb5a960fafbc15c59b9b4ce7a966
Bernardo Rufino [Thu, 28 Jun 2018 07:30:14 +0000 (08:30 +0100)]
Increase PerformBackupTask unit coverage
With KV Refactor in mind.
* Added tests around empty queue and single package backups.
* Refactored a bit some of the existing tests.
* Moved from mocking BMS to using a real instance and had to adjust a
few things for this.
Test: atest PerformBackupTaskTest
Change-Id: I0ee3be32c7cbac5ed2cdc2717408749907c15ade
David Brazdil [Tue, 17 Jul 2018 11:03:07 +0000 (04:03 -0700)]
Merge changes If285d71a,Iffe5be7c am:
f37950d8c3 am:
c9b5e65747
am:
3efb177ca6
Change-Id: If7f397e4be6ace357f7a563b4546a9a7694fce65
Jorim Jaggi [Sun, 15 Jul 2018 12:24:38 +0000 (14:24 +0200)]
Repin home once setup is complete
On a fresh device, the home intent resovles to SetupWizard. After
setup is complete, it will resolve to the regular home app. In
order to accomodate for that, repin home app once user setup is
complete.
Test: Wipe device, complete SUW, inspect pinner
Bug:
111132016
Change-Id: I904ecd2fed26bc1a3baf45c1b54da5fc6352d773
David Brazdil [Tue, 17 Jul 2018 10:56:43 +0000 (03:56 -0700)]
[automerger skipped] [DO NOT MERGE] Revert "Build dark greylist from public + light grey API" am:
ed1f171cb9 -s ours am:
dd540c644f -s ours
am:
548c2c0710 -s ours
Change-Id: I2c4c0a33dfd3eb8551f623fad24a078f51759710
TreeHugger Robot [Tue, 17 Jul 2018 10:53:58 +0000 (10:53 +0000)]
Merge "Remove unused line in PrecomputedText"
David Brazdil [Tue, 17 Jul 2018 10:53:35 +0000 (03:53 -0700)]
Merge changes If285d71a,Iffe5be7c am:
f37950d8c3
am:
c9b5e65747
Change-Id: I047358920ecc478de076c32384390ba856bd8c99
David Brazdil [Tue, 17 Jul 2018 10:48:42 +0000 (03:48 -0700)]
[automerger skipped] [DO NOT MERGE] Revert "Build dark greylist from public + light grey API" am:
ed1f171cb9 -s ours
am:
dd540c644f -s ours
Change-Id: Ie2115a3f82b78a632dec2c85527755bcb667253a