OSDN Git Service
Jaekyun Seok [Thu, 19 Apr 2018 00:10:16 +0000 (17:10 -0700)]
Merge "Switch user only if the user is changed" into pi-dev
am:
90903ac28b
Change-Id: Iae381c069616b4fbce5e1d4ffcc72176eda0758b
Tim Murray [Wed, 18 Apr 2018 23:59:26 +0000 (16:59 -0700)]
Merge "ActivityManagerService: add restricted cpuset" into pi-dev
am:
a5843ebb59
Change-Id: I1ad95b4e5e4d89efeb0a2836950d7d05cd8cd8d5
Jason Monk [Wed, 18 Apr 2018 23:54:05 +0000 (16:54 -0700)]
Merge "Make Instrumentation more robust to other inputs" into pi-dev
am:
3071522227
Change-Id: Ifc3e5c1959a3b25025f396fbfc91363580b239ad
Farid Zare Seisan [Wed, 18 Apr 2018 23:48:33 +0000 (16:48 -0700)]
Merge "Ignore mkdirs requests if CE storage not available." into pi-dev
am:
29f6a3fefd
Change-Id: Ie1330b037a37a39f748820ab9f038ed77397dd6c
TreeHugger Robot [Wed, 18 Apr 2018 23:48:19 +0000 (23:48 +0000)]
Merge "Switch user only if the user is changed" into pi-dev
Tim Murray [Wed, 18 Apr 2018 23:43:53 +0000 (23:43 +0000)]
Merge "ActivityManagerService: add restricted cpuset" into pi-dev
TreeHugger Robot [Wed, 18 Apr 2018 23:43:15 +0000 (23:43 +0000)]
Merge "Make Instrumentation more robust to other inputs" into pi-dev
TreeHugger Robot [Wed, 18 Apr 2018 23:37:38 +0000 (23:37 +0000)]
Merge "Ignore mkdirs requests if CE storage not available." into pi-dev
Pawin Vongmasa [Wed, 18 Apr 2018 23:04:08 +0000 (16:04 -0700)]
Merge "Dump IOmxStore" into pi-dev
am:
069c5b58b0
Change-Id: I8fd1557760b6f6917a1f15fdb42c8369b8112aad
TreeHugger Robot [Wed, 18 Apr 2018 22:44:01 +0000 (22:44 +0000)]
Merge "Dump IOmxStore" into pi-dev
Ryan Mitchell [Wed, 18 Apr 2018 22:22:06 +0000 (15:22 -0700)]
Merge "AAPT2: Modified StringPool uniqueness detection #2" into pi-dev
am:
b2182c412c
Change-Id: Ib7829b0203134eecdfd59a3dcd1e78b8fbdd39b4
Todd Kennedy [Wed, 18 Apr 2018 22:12:08 +0000 (15:12 -0700)]
Merge "Set default reference ID" into pi-dev
am:
2ee3ef0511
Change-Id: I2368a2f925fdcd81c24497112ed745dd8d237657
Nan Zhang [Wed, 18 Apr 2018 21:58:02 +0000 (14:58 -0700)]
[automerger skipped] Merge "Migrate android_uiautomator generation to Soong." am:
0e5b92eea6
am:
1cf2fb25aa -s ours
Change-Id: I65619b587f5eb3f6aa4fc57b1b961a955ad258d5
Ryan Mitchell [Wed, 18 Apr 2018 21:54:47 +0000 (21:54 +0000)]
Merge "AAPT2: Modified StringPool uniqueness detection #2" into pi-dev
Nan Zhang [Wed, 18 Apr 2018 21:51:30 +0000 (14:51 -0700)]
Merge "Migrate android_uiautomator generation to Soong."
am:
0e5b92eea6
Change-Id: I39fb52030ec03bbe2e9be7e296a9291fbd3184e4
TreeHugger Robot [Wed, 18 Apr 2018 21:50:40 +0000 (21:50 +0000)]
Merge "Set default reference ID" into pi-dev
jiabin [Wed, 18 Apr 2018 21:29:18 +0000 (14:29 -0700)]
Merge "Add setMin for A11y stream slider bar." into pi-dev
am:
b4cef2a588
Change-Id: I3ba6d43fa21a4fdf8047b4bd5c41b7a2d2ac002d
TreeHugger Robot [Wed, 18 Apr 2018 21:22:04 +0000 (21:22 +0000)]
Merge "Add setMin for A11y stream slider bar." into pi-dev
y [Tue, 17 Apr 2018 01:13:14 +0000 (18:13 -0700)]
AAPT2: Modified StringPool uniqueness detection #2
b/
77862560 detected that when converting an apk to binary using aapt2,
all resource ids of attributes that have been replaced with resource
identifiers become set to the identifier of the first attribute. This is
because the attribute names are all empty because the names are not necessary
since the resource ids are present. The empty attribute names all map to
the same string pool reference and cause all the ids to be the first
empty string into the string pool.
The ag/
3897499 approach to fix the specified bug was extremely inefficient
and caused hour long builds. This change takes advantage of the multimap
data structure to do lookups efficiently.
Bug:
77862560
Test: Converted apk in listed bug from proto to binary and observed
correct resource ids and correct badging. Also built the Android tree to
check for regressions in build time.
Change-Id: I27a9ee4ffbed8b9ff6f238ad315cdf87b588947c
Chenjie Yu [Wed, 18 Apr 2018 20:45:45 +0000 (13:45 -0700)]
Merge "add dump report reason to reports" into pi-dev
am:
a194a6bee3
Change-Id: I07a2d92ae166e86afa5bd6600d1217180818b9c3
TreeHugger Robot [Wed, 18 Apr 2018 20:35:29 +0000 (20:35 +0000)]
Merge "add dump report reason to reports" into pi-dev
Malcolm Chen [Wed, 18 Apr 2018 20:27:46 +0000 (13:27 -0700)]
Merge "Add carrier config for partial sms raw message expiration." into pi-dev
am:
3d0ff90649
Change-Id: I2b9d6d58ab96264bbfac72ccde37fdf841b17373
Chenjie Yu [Mon, 16 Apr 2018 22:18:30 +0000 (15:18 -0700)]
add dump report reason to reports
+ also change uidmapping version numbers to int64_t
Bug:
78132855
Change-Id: Iac7ea93e4bf651bd65bd03383e7ab4971af4fc29
Fix:
78132855
Test: gts test
Treehugger Robot [Wed, 18 Apr 2018 20:17:54 +0000 (20:17 +0000)]
Merge "Migrate android_uiautomator generation to Soong."
TreeHugger Robot [Wed, 18 Apr 2018 20:15:16 +0000 (20:15 +0000)]
Merge "Add carrier config for partial sms raw message expiration." into pi-dev
Winson Chung [Wed, 18 Apr 2018 20:11:50 +0000 (13:11 -0700)]
Merge "Prevent early onEnterAnimationComplete callback for recents target" into pi-dev
am:
a3a1e8ad79
Change-Id: I6de4b410f7608b3deb2f6abb7214808d3b9d829f
Winson Chung [Wed, 18 Apr 2018 20:07:06 +0000 (13:07 -0700)]
Merge "Fix regression in assist data fetching and canceling" into pi-dev
am:
5513302b43
Change-Id: I7c4e6bf2b66455f39ffff95f49dbffcf2b289b74
Michael Wright [Wed, 18 Apr 2018 19:54:55 +0000 (12:54 -0700)]
Merge "Use config_longPressVibePattern as heavy click fallback." into pi-dev
am:
654cd3a226
Change-Id: Icf4f144e653e08479dcfc853dbdbd4bf68cea7f5
Amin Shaikh [Wed, 18 Apr 2018 19:49:57 +0000 (12:49 -0700)]
Merge "Ensure QS does not expand when qs disabled." into pi-dev
am:
3a958d3fce
Change-Id: Ic867d2e75945b27b82ffc5d62202371ee72321e9
Jason Monk [Wed, 18 Apr 2018 19:43:50 +0000 (15:43 -0400)]
Make Instrumentation more robust to other inputs
Test: atest cts/tests/app/src/android/app/cts/InstrumentationTest.java
Change-Id: I2d55274ab19c4687ce85c086f2da61a4316b8096
Fixes:
70720100
Pavel Grafov [Wed, 18 Apr 2018 19:39:42 +0000 (12:39 -0700)]
Merge "Serialize key eviction vs. user storage preparation" into pi-dev
am:
a2f4dd1cfd
Change-Id: I9b4e65b55a0201e054ed624a2747c9a0473e42d0
Winson Chung [Wed, 18 Apr 2018 19:35:53 +0000 (19:35 +0000)]
Merge "Prevent early onEnterAnimationComplete callback for recents target" into pi-dev
Kenny Guy [Wed, 18 Apr 2018 19:34:49 +0000 (12:34 -0700)]
Merge "Record timestamp when brightness tracker is called" into pi-dev
am:
eb432b1092
Change-Id: I975e90016eb93d15f4fb04f724dc526835f51f13
Winson Chung [Wed, 18 Apr 2018 19:34:21 +0000 (19:34 +0000)]
Merge "Fix regression in assist data fetching and canceling" into pi-dev
TreeHugger Robot [Wed, 18 Apr 2018 19:31:26 +0000 (19:31 +0000)]
Merge "Use config_longPressVibePattern as heavy click fallback." into pi-dev
Rob Carr [Wed, 18 Apr 2018 19:27:38 +0000 (12:27 -0700)]
Merge "ViewRoot: Ensure we release surface from setWindowStopped." into pi-dev
am:
3ef2d6d9d8
Change-Id: I6c14d19d72d03d975e6b1e34b00fc9ac879e4811
jiabin [Wed, 18 Apr 2018 19:24:37 +0000 (12:24 -0700)]
Add setMin for A11y stream slider bar.
Since the volume of accessiblity will not go to 0, add setMin for A11y
stream slider in case it goes to 0 in volume panel.
Bug:
72403580
Test: Add log in onProgressChanged and check A11y stream won't go to 0.
Change-Id: Ie8c88c8a40fad4d281997922df8acb8f446288c7
TreeHugger Robot [Wed, 18 Apr 2018 19:23:40 +0000 (19:23 +0000)]
Merge "Ensure QS does not expand when qs disabled." into pi-dev
TreeHugger Robot [Wed, 18 Apr 2018 19:12:36 +0000 (19:12 +0000)]
Merge "Serialize key eviction vs. user storage preparation" into pi-dev
TreeHugger Robot [Wed, 18 Apr 2018 19:09:25 +0000 (19:09 +0000)]
Merge "Record timestamp when brightness tracker is called" into pi-dev
Evan Laird [Wed, 18 Apr 2018 19:06:29 +0000 (12:06 -0700)]
Merge "Don't apply corner cutout insets if we're already inset enough" into pi-dev
am:
f0cbbff692
Change-Id: I8c0e23fcac114f7dc41bf45f60b75408ab53a5bf
Tim Murray [Wed, 18 Apr 2018 19:00:26 +0000 (12:00 -0700)]
Merge "ActivityManagerService: ensure updateOomAdjLocked gets called early" into pi-dev
am:
3148dbf80d
Change-Id: Ia7902146d83b84c5b22ec21770de359834a4a935
Rob Carr [Wed, 18 Apr 2018 18:59:43 +0000 (18:59 +0000)]
Merge "ViewRoot: Ensure we release surface from setWindowStopped." into pi-dev
Todd Kennedy [Wed, 18 Apr 2018 18:52:34 +0000 (11:52 -0700)]
Merge "Don't consider resources < 0 as invalid" into pi-dev
am:
6fc7e38bbe
Change-Id: I649f0e947771a9d8d1c74bbbb2aed8ae5bd3b960
TreeHugger Robot [Wed, 18 Apr 2018 18:48:53 +0000 (18:48 +0000)]
Merge "Don't apply corner cutout insets if we're already inset enough" into pi-dev
TreeHugger Robot [Wed, 18 Apr 2018 18:48:48 +0000 (18:48 +0000)]
Merge "ActivityManagerService: ensure updateOomAdjLocked gets called early" into pi-dev
Jeff Sharkey [Wed, 18 Apr 2018 18:41:52 +0000 (11:41 -0700)]
Merge "Grant notification Uri permissions as sending app." into pi-dev
am:
56487413b7
Change-Id: I2c04b6d22bdb5f8265cdfe56bf46de6a92d3d369
Dan Cashman [Wed, 18 Apr 2018 18:35:58 +0000 (11:35 -0700)]
Merge "Add AccountManager key rotation awareness." into pi-dev
am:
3091d60a70
Change-Id: Ife05dbf2b6e138ef928e597d42c99a12997e7b74
TreeHugger Robot [Wed, 18 Apr 2018 18:33:36 +0000 (18:33 +0000)]
Merge "Don't consider resources < 0 as invalid" into pi-dev
Yu-Han Yang [Wed, 18 Apr 2018 18:26:49 +0000 (11:26 -0700)]
Merge "Add setting for GNSS location request update duration" into pi-dev
am:
af52d9815a
Change-Id: If268c45fa38671ebe17b4f7c0c9d58b2029cea48
Jeff Sharkey [Wed, 18 Apr 2018 18:18:48 +0000 (18:18 +0000)]
Merge "Grant notification Uri permissions as sending app." into pi-dev
TreeHugger Robot [Wed, 18 Apr 2018 18:14:34 +0000 (18:14 +0000)]
Merge "Add AccountManager key rotation awareness." into pi-dev
Shuo Qian [Wed, 18 Apr 2018 18:12:20 +0000 (11:12 -0700)]
[automerger skipped] Merge "Revert "Remove the OEM hook implementation and usage"" into pi-dev
am:
e116dcc57c -s ours
Change-Id: Ia6518f01fd5dfec3909bac318f0596ed83013bcf
TreeHugger Robot [Wed, 18 Apr 2018 18:10:04 +0000 (18:10 +0000)]
Merge "Add setting for GNSS location request update duration" into pi-dev
Nan Zhang [Fri, 13 Apr 2018 22:58:29 +0000 (15:58 -0700)]
Migrate android_uiautomator generation to Soong.
Bug: b/
70351683
Test: m clean && m android_uiautomator
and compare the old and new stubs.jar using md5sum.
Change-Id: I01937352ae1a470745f2ab1a9acbb4ea9520e153
Merged-In: I01937352ae1a470745f2ab1a9acbb4ea9520e153
Kenny Guy [Wed, 18 Apr 2018 17:42:10 +0000 (18:42 +0100)]
Record timestamp when brightness tracker is called
Associate the brightness slider event timestamp with
the time the tracker is called rather than when
the background handler handles the call.
Bug:
78224086
Test: atest BrightnessTrackerTest
Change-Id: I083fdcc10f223ab7398911d9cb63dca5d8681fc4
Shuo Qian [Wed, 18 Apr 2018 17:50:31 +0000 (17:50 +0000)]
Merge "Revert "Remove the OEM hook implementation and usage"" into pi-dev
Matthew Ng [Wed, 18 Apr 2018 17:42:49 +0000 (10:42 -0700)]
Merge "Fixes no vibration on old nav bar" into pi-dev
am:
73f8361354
Change-Id: I4e6cac63be2557e22cb690d3ef680b09faed93a2
Michael Wright [Mon, 16 Apr 2018 18:35:13 +0000 (19:35 +0100)]
Use config_longPressVibePattern as heavy click fallback.
Rather than using the regular click effect as the fallback, use the long
press pattern since heavy click is the new effect for long press. This
also lets us distinguish the two effects in the configuration.
Bug:
77863933
Test: long-press on something, feel the effect
Change-Id: Ie22d064cbdd2d33702180cb528d743e75ff8ae63
Tracy Zhou [Wed, 18 Apr 2018 17:37:51 +0000 (10:37 -0700)]
Merge "Revert "Fix "Screen is pinned" dialog not showing completely in multi-window"" into pi-dev
am:
e3b59d6376
Change-Id: I908e8f914b58d8c80873256bbea95e3f45ab9e3a
Dianne Hackborn [Wed, 18 Apr 2018 17:29:59 +0000 (10:29 -0700)]
Merge "Fix issue #
74248644: Swiping away task increments start ID of running services" into pi-dev
am:
32643c6644
Change-Id: I9c3b0ebb63ba46bfcbdf26f46476048d8b53f6c4
Todd Kennedy [Tue, 17 Apr 2018 16:55:31 +0000 (09:55 -0700)]
Don't consider resources < 0 as invalid
The only invalid resource ID is '0'. All other resource IDs are
valid; even negative resource IDs.
With the introduction of namespaces in AAPT2, resource IDs start with
0x80, 0x81, ... [ie. because Java only supports signed types, they are
considered negative]. For app transition animations negative resource
IDs were incorrectly considered "invalid".
Change-Id: I24032baa54860459d4f1b8e17a80c760c48d5579
Fixes:
70716301
Test: Manual. Run multi-split APK and see that transition animations work when defined in a split
TreeHugger Robot [Wed, 18 Apr 2018 17:27:33 +0000 (17:27 +0000)]
Merge "Fixes no vibration on old nav bar" into pi-dev
Todd Kennedy [Wed, 18 Apr 2018 17:25:45 +0000 (10:25 -0700)]
Set default reference ID
The reference ID may not be set [when the reference ID is 0x00], so,
we need to ensure it has a proper default value; instead of garbage
Change-Id: Ie1bcf062fbb1aab5832cf210f68b24732af5dc3b
Fixes:
74389717
Test: Run gReader and see that it doesn't crash
TreeHugger Robot [Wed, 18 Apr 2018 17:25:00 +0000 (17:25 +0000)]
Merge "Revert "Fix "Screen is pinned" dialog not showing completely in multi-window"" into pi-dev
Tracy Zhou [Mon, 16 Apr 2018 20:36:37 +0000 (20:36 +0000)]
Revert "Fix "Screen is pinned" dialog not showing completely in multi-window"
This reverts commit
be26707695e3cf4785e716b9814a067d50cd1123.
Reason for revert: Caused regression in b/
77976945
Fixes:
77976945
Bug:
73513388
Change-Id: I8c83a823d7421563ea5a2eab2e20cb2b06ec6068
TreeHugger Robot [Wed, 18 Apr 2018 17:21:11 +0000 (17:21 +0000)]
Merge "Fix issue #
74248644: Swiping away task increments start ID of running services" into pi-dev
Chenjie Yu [Wed, 18 Apr 2018 17:20:42 +0000 (10:20 -0700)]
Merge "Fix merge isolated uid to host uid" into pi-dev
am:
2abcea2b8a
Change-Id: Ib1f2929cea7ecc1345f78c3c2c1296cecfcc814b
TreeHugger Robot [Wed, 18 Apr 2018 17:07:13 +0000 (17:07 +0000)]
Merge "Fix merge isolated uid to host uid" into pi-dev
Cassie [Wed, 18 Apr 2018 17:05:44 +0000 (10:05 -0700)]
Merge "Fix a tiny bug in NetworkScanRequest" into pi-dev
am:
27cd1f7e20
Change-Id: I66eebeab2f4a3c3029a437fc1bd717cc745c6051
Tim Murray [Wed, 18 Apr 2018 17:00:26 +0000 (10:00 -0700)]
Merge "ActivityManagerService: make bluetooth actually persistent" into pi-dev
am:
89b1a4ee0f
Change-Id: I9b8683effd9efccc7eb222e471d466bb529f451c
TreeHugger Robot [Wed, 18 Apr 2018 16:52:34 +0000 (16:52 +0000)]
Merge "Fix a tiny bug in NetworkScanRequest" into pi-dev
Tim Murray [Fri, 13 Apr 2018 17:15:17 +0000 (10:15 -0700)]
ActivityManagerService: add restricted cpuset
Test: CTS
bug
78197570
Change-Id: I9dd8daba6426b42b7e7e9388dbdac7bd8110b6ca
Tim Murray [Wed, 18 Apr 2018 16:43:39 +0000 (09:43 -0700)]
ActivityManagerService: ensure updateOomAdjLocked gets called early
If updateOomAdjLocked isn't called before android.bg is put into the bg
cpuset, then updateOomAdjLocked will put android.bg in the fg cpuset.
Test: boots
Bug:
77908520
Change-Id: If88a6a59f4ca4fe7d1c6ed149f59282aad26600a
Tim Murray [Wed, 18 Apr 2018 16:49:39 +0000 (16:49 +0000)]
Merge "ActivityManagerService: make bluetooth actually persistent" into pi-dev
Tim Murray [Tue, 17 Apr 2018 04:43:33 +0000 (21:43 -0700)]
ActivityManagerService: make bluetooth actually persistent
com.android.bluetooth was being marked as a persistent service in terms
of OOM adjustment, but it was only being marked as important foreground for
scheduling reasons. Make sure that persistent services are correctly
marked as persistent for the purposes of scheduling too.
bug
78197570
Test: dumpsys activity
Change-Id: Ieb2fe4253cac1202bd94a42356bb32f9e77b5637
Jason Monk [Wed, 18 Apr 2018 16:44:14 +0000 (09:44 -0700)]
Merge "Slices: Don't use public namespace for internal intent" into pi-dev
am:
84208c724e
Change-Id: I95ea37a760470dcfdfb4ac9c1ab5c99c2fc72a5d
TreeHugger Robot [Wed, 18 Apr 2018 16:34:06 +0000 (16:34 +0000)]
Merge "Slices: Don't use public namespace for internal intent" into pi-dev
Pavel Grafov [Tue, 10 Apr 2018 18:19:01 +0000 (19:19 +0100)]
Serialize key eviction vs. user storage preparation
UserManagerService.onBeforeUnlockUser requires unlocked user key
and is executed on FgThread. Currently key may be locked from
a different thread: UserController.finishUserStopped is executed in
mHandler. This changes moves lockUserKey part to FgThread, so that
key state can be reliably checked before starting onBeforeUnlockUser.
In the worst case user will be RUNNING_LOCKED with "Some functionality
may be limited" warning and unable to start apps. But that seems
fairly harmless.
+ got rid of redundant boolean in finishUserStopped.
Fixes:
72334925
Test: Turn work mode on and off ad nauseam
Test cts-tradefed run commandAndExit cts-dev -m CtsDevicePolicyManagerTestCases
-t com.android.cts.devicepolicy.ManagedProfileTest
Test: creating another user and swithching back and forth
Test: exercising DPMS.lockNow(FLAG_EVICT_CREDENTIAL_ENCRYPTION_KEY) via TestDPC
Change-Id: I01d4dea183fd1a35a2e47284c7a544725e8a871f
David Brazdil [Wed, 18 Apr 2018 16:01:04 +0000 (09:01 -0700)]
Merge changes I9876ff6b,Iccd7c1c1 into pi-dev
am:
b914565f6a
Change-Id: I4fae1442aca58e45b98f18294b842697dc36dfb6
Jeff Sharkey [Tue, 17 Apr 2018 18:16:20 +0000 (12:16 -0600)]
Grant notification Uri permissions as sending app.
For security reasons, the system UID can't make URI permission as
itself; it always needs to do so on behalf of a specific app. To
handle this, we grant notification Uri permissions as the UID that
sent a given notification.
To give meaningful debug messages to developers, check to see if the
caller has permissions to grant Uri access when they're enqueuing
a notification. If they're targeting P, throw any security issues
back at the caller; if older SDK, log and ignore that Uri.
Since multiple notifications can grant access to the same content,
we need unique UriPermissionOwner per active notification. For
example, consider these two notifications:
1. sound=content://sound, image=content://image1
2. sound=content://sound, image=content://image2
When #1 is cancelled, we still need to keep the content://sound
grant active until #2 is also cancelled. Using unique owners
means that ActivityManagerService tracks reference counting on
our behalf.
Optimizations to avoid allocations in hot code paths.
Test: atest frameworks/base/services/tests/uiservicestests/src/com/android/server/notification
Bug:
9069730
Change-Id: I69601793538adcbf06c4986a2fb1ea2dd9d876eb
David Brazdil [Wed, 18 Apr 2018 15:52:58 +0000 (08:52 -0700)]
Merge "Delete hiddenapi-blacklist.txt file" into pi-dev
am:
6644a0ec4f
Change-Id: I81145468853afae4af1f67c8d6a64d6e3158cad6
David Brazdil [Wed, 18 Apr 2018 15:48:50 +0000 (15:48 +0000)]
Merge changes I9876ff6b,Iccd7c1c1 into pi-dev
* changes:
Add more hidden API on light greylist
Add Thread.contextClassLoader to hidden API light greylist
David Brazdil [Wed, 18 Apr 2018 15:46:03 +0000 (08:46 -0700)]
Merge "Sort hiddenapi-light-greylist.txt" into pi-dev
am:
a74badbe26
Change-Id: Ib5d3e7b88977dbcbd7ce23564b6a8b7f7754566b
David Brazdil [Wed, 18 Apr 2018 15:35:39 +0000 (15:35 +0000)]
Merge "Delete hiddenapi-blacklist.txt file" into pi-dev
David Brazdil [Wed, 18 Apr 2018 15:35:07 +0000 (15:35 +0000)]
Merge "Sort hiddenapi-light-greylist.txt" into pi-dev
Julia Reynolds [Wed, 18 Apr 2018 15:32:47 +0000 (08:32 -0700)]
Merge "Only show settings icon for set up users" into pi-dev
am:
c183cea754
Change-Id: I9cd5842bcb562d67f1d106566ff9102dc18d11b1
Julia Reynolds [Wed, 18 Apr 2018 15:24:03 +0000 (15:24 +0000)]
Merge "Only show settings icon for set up users" into pi-dev
Amin Shaikh [Wed, 18 Apr 2018 14:45:13 +0000 (10:45 -0400)]
Ensure QS does not expand when qs disabled.
Remove unnecessary QSContainerImpl measure logic to constrain the
height to QQS height when QS is disabled. This interferes with
NotificationPanelView's logic for determining QS expansion.
Change-Id: I7e6659cc12dae2fbaa16d15a63c709dd96177b97
Fixes:
72739219
Test: manual
Julia Reynolds [Wed, 18 Apr 2018 14:41:46 +0000 (07:41 -0700)]
Merge "Color and text changes" into pi-dev
am:
03ddb28cda
Change-Id: I0d66ab47686ef3d63d5a18bef890891a66261203
Jason Monk [Wed, 18 Apr 2018 14:37:19 +0000 (10:37 -0400)]
Slices: Don't use public namespace for internal intent
Test: manual
Change-Id: I21bc0a367456b58de195d71fc29cca0dbbca6927
Fixes:
78214697
Nicolas Geoffray [Wed, 18 Apr 2018 14:37:04 +0000 (07:37 -0700)]
Merge "Add UUID->mostSigBits to light grey." into pi-dev
am:
b1b2e0e92c
Change-Id: I101b25a04069142a2ac285e878194db26ab549a5
Pawin Vongmasa [Wed, 18 Apr 2018 14:01:47 +0000 (07:01 -0700)]
Dump IOmxStore
IOmxStore may be in a different process from IOmx.
Test: adb bugreport
Bug:
78218851
Change-Id: I990b202353aa7e736413faad1c3404975ade5c4e
Android Build Merger (Role) [Wed, 18 Apr 2018 14:17:51 +0000 (14:17 +0000)]
Merge "Merge "Stop InCall Notification to avoid track leak" am:
b47c9019b5 am:
1105966734" into pi-dev-plus-aosp
Nicolas Geoffray [Wed, 18 Apr 2018 14:17:07 +0000 (07:17 -0700)]
Merge "Add Landroid/app/LoadedApk;->mLibDir:Ljava/lang/String; to light grey." into pi-dev
am:
7ed8513166
Change-Id: I1bb94d7366f4d47a4e7af39535ecbcec79175567
luochaojiang [Wed, 18 Apr 2018 14:17:04 +0000 (07:17 -0700)]
Merge "Stop InCall Notification to avoid track leak" am:
b47c9019b5
am:
1105966734
Change-Id: I367a09e58e6c651b7527f7a9ef2715bad79b5439
Julia Reynolds [Wed, 18 Apr 2018 14:01:20 +0000 (10:01 -0400)]
Only show settings icon for set up users
Test: manual inspection
Change-Id: Iec065269eaed7a906fafad332b1ef168f575773b
Fixes:
77548684
Nicolas Geoffray [Wed, 18 Apr 2018 14:07:22 +0000 (07:07 -0700)]
Merge "Add new light greylist APIs." into pi-dev
am:
c4c7321693
Change-Id: If9baa34ffbb99eae37780f09d51d3efdc0d6f32d
luochaojiang [Wed, 18 Apr 2018 14:05:23 +0000 (07:05 -0700)]
Merge "Stop InCall Notification to avoid track leak"
am:
b47c9019b5
Change-Id: I1bf6b52a8a82ddc5880871344a8f5af53ebf8322
TreeHugger Robot [Wed, 18 Apr 2018 14:01:01 +0000 (14:01 +0000)]
Merge "Color and text changes" into pi-dev