OSDN Git Service
Jorim Jaggi [Thu, 19 Apr 2018 15:28:16 +0000 (08:28 -0700)]
Merge "Revert "Don't consider resources < 0 as invalid"" into pi-dev
am:
2557f34102
Change-Id: Iff2cbb469b137cbc7cbb258d001d3330451f2221
Bernie Innocenti [Thu, 19 Apr 2018 15:23:07 +0000 (08:23 -0700)]
Merge "Adjust APF interpreter tests to match APFv4" am:
05011abf27
am:
e56afce9e9
Change-Id: Iac5a843c1476dd96029956bba7e68aed538d0c52
Jorim Jaggi [Thu, 19 Apr 2018 15:18:23 +0000 (15:18 +0000)]
Merge "Revert "Don't consider resources < 0 as invalid"" into pi-dev
Jeff Sharkey [Thu, 19 Apr 2018 15:09:24 +0000 (08:09 -0700)]
Merge "Visit Uris in RemoteViews for granting purposes." into pi-dev
am:
1cd96854d4
Change-Id: Ie979847bd41777cef2b4169cb7f78abe174d054d
Jeff Sharkey [Thu, 19 Apr 2018 14:58:02 +0000 (14:58 +0000)]
Merge "Visit Uris in RemoteViews for granting purposes." into pi-dev
Bernie Innocenti [Thu, 19 Apr 2018 14:25:11 +0000 (07:25 -0700)]
Merge "Adjust APF interpreter tests to match APFv4"
am:
05011abf27
Change-Id: I5ca2b41ab6c101bef7465229270079c81743c757
Adrian Roos [Thu, 19 Apr 2018 14:10:52 +0000 (07:10 -0700)]
Merge "AOD: Ensure WakeLock is held for delayed dozeTimeTick" into pi-dev
am:
4fca6d6b31
Change-Id: I6664456dd641d9e1abb2fe9d65841fadb2299f37
TreeHugger Robot [Thu, 19 Apr 2018 13:59:25 +0000 (13:59 +0000)]
Merge "AOD: Ensure WakeLock is held for delayed dozeTimeTick" into pi-dev
Jorim Jaggi [Thu, 19 Apr 2018 13:27:52 +0000 (13:27 +0000)]
Revert "Don't consider resources < 0 as invalid"
This reverts commit
fbcf20819182107fcf1d3fb894881754e2fbb7f6.
Reason for revert: Breaks all window animations
Bug:
78264055
Change-Id: Iaa09626ad8dc26a3fde1ecc402dc2bd28df99627
Jorim Jaggi [Thu, 19 Apr 2018 13:19:24 +0000 (06:19 -0700)]
Merge "Animate home in separate layer" into pi-dev
am:
e3a34816dc
Change-Id: I76fe28eb0091f974eb63d4fd6e3ec32beac19ddf
Bernie Innocenti [Thu, 19 Apr 2018 13:17:20 +0000 (13:17 +0000)]
Merge "Adjust APF interpreter tests to match APFv4"
David Brazdil [Thu, 19 Apr 2018 13:14:13 +0000 (06:14 -0700)]
Merge "Add one more hidden API to light greylist" into pi-dev
am:
b7f1777d0a
Change-Id: I8a724e035ec926aded9c3d1fea9b1534bacf6e88
Nicolas Geoffray [Thu, 19 Apr 2018 13:06:13 +0000 (06:06 -0700)]
Merge "Add UUID->leastSigBits to light grey." into pi-dev
am:
95211ec766
Change-Id: I113db5d3b92c59e842afe49680ae3b666701da0c
Jorim Jaggi [Thu, 19 Apr 2018 13:01:48 +0000 (13:01 +0000)]
Merge "Animate home in separate layer" into pi-dev
David Brazdil [Thu, 19 Apr 2018 12:59:40 +0000 (12:59 +0000)]
Merge "Add one more hidden API to light greylist" into pi-dev
Nicolas Geoffray [Thu, 19 Apr 2018 12:51:27 +0000 (12:51 +0000)]
Merge "Add UUID->leastSigBits to light grey." into pi-dev
Erik Kline [Thu, 19 Apr 2018 12:25:18 +0000 (05:25 -0700)]
Merge "Actually resolve all IPs for Private DNS hostname" am:
5ace372bc2
am:
5124d28e64
Change-Id: I1e5de255c4ee11f46dc8a1e3f5eaca2f2be1c792
Erik Kline [Thu, 19 Apr 2018 12:15:13 +0000 (05:15 -0700)]
Merge "Actually resolve all IPs for Private DNS hostname"
am:
5ace372bc2
Change-Id: I83ffc854b60f2beb0a9e4c8a107ce26b656c935e
Treehugger Robot [Thu, 19 Apr 2018 11:02:29 +0000 (11:02 +0000)]
Merge "Actually resolve all IPs for Private DNS hostname"
David Brazdil [Thu, 19 Apr 2018 09:59:32 +0000 (10:59 +0100)]
Add one more hidden API to light greylist
Bug:
78229662
Test: make
Change-Id: I603e48d795d6d805f46389f9edbd81ffd6c66696
Erik Kline [Thu, 19 Apr 2018 08:58:15 +0000 (17:58 +0900)]
Actually resolve all IPs for Private DNS hostname
Previously, we reused the OneAddressPerFamilyNetwork which does
what it says on the tin. For the resolution that will be used
to program netd this is not what we really want.
Test: as follows
- built
- flashed
- booted
- runtest frameworks-net passes
- manual testing of Private DNS passes
Bug:
64133961
Change-Id: Ieccc4d208b314b81061dc78d83848f97acefe04b
Mathew Inwood [Thu, 19 Apr 2018 07:18:29 +0000 (00:18 -0700)]
Merge "Add proto constants for hidden API logging." into pi-dev
am:
8182e354d8
Change-Id: Id3f1d80af5d3a77127df0ca2c746da1db943067a
Mathew Inwood [Thu, 19 Apr 2018 07:09:19 +0000 (07:09 +0000)]
Merge "Add proto constants for hidden API logging." into pi-dev
Sanry Huang [Thu, 19 Apr 2018 07:01:33 +0000 (00:01 -0700)]
Merge "Fix notification bar can be dragged when SIM PIN lock screen." into pi-dev
am:
5e019b5f8b
Change-Id: I162486ac973bc59d22b400261f15a233ab67e718
Sanry Huang [Thu, 19 Apr 2018 06:49:19 +0000 (06:49 +0000)]
Merge "Fix notification bar can be dragged when SIM PIN lock screen." into pi-dev
Yohei Yukawa [Thu, 19 Apr 2018 04:12:12 +0000 (21:12 -0700)]
Merge "Fix unnecessarily extended View lifetime in IMMS" into pi-dev
am:
3e180afa02
Change-Id: Ic3d7b3fb51cc2b5cee8e2ae508679e2035d0931b
TreeHugger Robot [Thu, 19 Apr 2018 04:01:36 +0000 (04:01 +0000)]
Merge "Fix unnecessarily extended View lifetime in IMMS" into pi-dev
Jeff Sharkey [Thu, 19 Apr 2018 03:32:12 +0000 (21:32 -0600)]
Visit Uris in RemoteViews for granting purposes.
RemoteViews end up passing around Uris, so we need to extend Uri
permission grants for them to ensure the recipient of a Notification
object is able to render its contents.
Bug:
9069730
Test: atest frameworks/base/services/tests/uiservicestests/src/com/android/server/notification
Change-Id: Id31b5adaf2ee66113a1b503e32126aeddbf97b28
Felipe Leme [Thu, 19 Apr 2018 03:19:27 +0000 (20:19 -0700)]
Merge "Fixed autofill forged package check to only compare the package name." into pi-dev
am:
2fbdb17cd3
Change-Id: Ife0af02000708eed0b6e94349b043f92d1e08815
TreeHugger Robot [Thu, 19 Apr 2018 03:10:35 +0000 (03:10 +0000)]
Merge "Fixed autofill forged package check to only compare the package name." into pi-dev
Felipe Leme [Wed, 18 Apr 2018 21:25:00 +0000 (14:25 -0700)]
Fixed autofill forged package check to only compare the package name.
Otherwise, it will log false negatives when app launches a new activity in the
same autofill session. Example:
04-18 19:34:32.392 5423 7199 W AutofillSession: Activity ComponentInfo{com.netgear.WiFiAnalytics/com.netgear.WiFiAnalytics.WiFiAnalyticsWifiRoomSignal} forged different component on AssistStructure: ComponentInfo{com.netgear.WiFiAnalytics/com.netgear.WiFiAnalytics.WiFiAnalyticsWifiAnalyzerTab}
Fixes:
78235438
Bug:
69981710
Test: manual verification, cannot be CTS tested.
Test: CtsAutoFillServiceTestCases
Change-Id: I0408cd159c2be22841a1f6c36a4a2c17e59a6219
Tracy Zhou [Thu, 19 Apr 2018 01:43:05 +0000 (18:43 -0700)]
Merge "Implement swipe up and quick scrub onboarding" into pi-dev
am:
08a2028228
Change-Id: Ie6a41f240dda33edcfa8f5015ae0884ca9701e94
Sunny Goyal [Thu, 19 Apr 2018 01:17:13 +0000 (18:17 -0700)]
Merge "Reducing the touch slop for quickstep" into pi-dev
am:
0a16178660
Change-Id: If92a5282ba9abae05eaec72571dd44d34050cf6e
TreeHugger Robot [Thu, 19 Apr 2018 01:16:20 +0000 (01:16 +0000)]
Merge "Implement swipe up and quick scrub onboarding" into pi-dev
TreeHugger Robot [Thu, 19 Apr 2018 01:04:45 +0000 (01:04 +0000)]
Merge "Reducing the touch slop for quickstep" into pi-dev
Michael Wachenschwanz [Thu, 19 Apr 2018 00:46:48 +0000 (17:46 -0700)]
Merge "No AppStandby tracking of non existent packages and add parole window" into pi-dev
am:
b2097fcab6
Change-Id: I03424668040067ab43881bbaa8f832071c6f6296
Suprabh Shukla [Thu, 19 Apr 2018 00:42:13 +0000 (17:42 -0700)]
Merge "Added more documentation for dialogMessage" into pi-dev
am:
4d5d3a0254
Change-Id: I241ddd624eb4409eacde7a3224dc27fa80d5de10
Amin Shaikh [Thu, 19 Apr 2018 00:36:40 +0000 (17:36 -0700)]
Merge "Rely on tile state for on/off a11y announcement." into pi-dev
am:
df173b59f6
Change-Id: Ib2e3e17063627b82dc2539e2e9ecb74c3963a16f
Yohei Yukawa [Thu, 19 Apr 2018 00:31:27 +0000 (17:31 -0700)]
Fix unnecessarily extended View lifetime in IMMS
Currently InputMethodManagerService (IMMS) unnecessarily extends the
lifetime of View objects used to show IME switcher dialog until the
dialog is shown again, because it forgets to clear
IMMS#mSwitchingDialogTitleView with null even after the dialog is
closed.
As a result, roughly 1.5MB of RAM will be unnecessarily consumed by
the system_server once after the IME switcher dialog is shown until
the device is rebooted.
With this CL, IMMS#mSwitchingDialogTitleView will be cleared with null
when the dialog is closed.
Fixes:
78245299
Test: Manually made sure that IMMS does not hold strong references to
View objects used for IME switcher dialog after the dialog is
closed.
Change-Id: I9fee92bb2974edeceacc680686095df480efba29
TreeHugger Robot [Thu, 19 Apr 2018 00:16:08 +0000 (00:16 +0000)]
Merge "No AppStandby tracking of non existent packages and add parole window" into pi-dev
TreeHugger Robot [Thu, 19 Apr 2018 00:13:13 +0000 (00:13 +0000)]
Merge "Added more documentation for dialogMessage" into pi-dev
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
Tracy Zhou [Mon, 16 Apr 2018 22:47:29 +0000 (15:47 -0700)]
Implement swipe up and quick scrub onboarding
Bug:
70180942
Test: manual test
Change-Id: I5c487d1e4ab800450c6b5a8f7ad1bf7434e45904
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
TreeHugger Robot [Wed, 18 Apr 2018 23:53:11 +0000 (23:53 +0000)]
Merge "Rely on tile state for on/off a11y announcement." into pi-dev
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
Sunny Goyal [Wed, 18 Apr 2018 23:39:50 +0000 (16:39 -0700)]
Reducing the touch slop for quickstep
Also fxing some wrong thresholds being used for slop comparisions
Test: Verified on device
Bug:
78232923
Change-Id: I0b10a921002f2e45d0d2472a3e690d1526f4aecb
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
Suprabh Shukla [Wed, 11 Apr 2018 23:03:49 +0000 (16:03 -0700)]
Added more documentation for dialogMessage
Added explanation that callers can use a format string which takes a
single argument which is the name of the suspended app that the user
tried to launch.
Test: make docs
Bug:
77507744
Change-Id: I0a5259048332030385265ceab9c7d76766abac7d
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
Michael Wachenschwanz [Fri, 30 Mar 2018 19:45:18 +0000 (12:45 -0700)]
No AppStandby tracking of non existent packages and add parole window
Disallow attempts to change standby bucket of nonexistent packages.
Also, add a parole window for idle apps. When parole for idle apps is
ready to be set, check that there is network availabilty. If there is
none, wait for network or the end of the parole window before setting
parole.
Change-Id: I7b8786f59b8da76325f2591cc7b1f86753d52d7b
Fixes: b/
71857185
Fixes: b/
74345840
Test: atest android.app.usage.cts.UsageStatsTest#testIgnoreNonexistentPackage
Test: manual (enable DEBUG and COMPRESS_TIME in AppStandbyController)
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