OSDN Git Service
Mehdi Alizadeh [Sat, 29 Jun 2019 05:11:17 +0000 (22:11 -0700)]
Merge "Persists share targets after reading from Apps xml resource" into qt-dev
am:
ffdf5b5639
Change-Id: Iaa48b606e1a01a9430bbd3dac59b449decc18297
Mehdi Alizadeh [Sat, 29 Jun 2019 04:47:23 +0000 (04:47 +0000)]
Merge "Persists share targets after reading from Apps xml resource" into qt-dev
Philip P. Moltmann [Sat, 29 Jun 2019 03:54:56 +0000 (20:54 -0700)]
Merge "Disable historical appops" into qt-dev
am:
16128cc7a2
Change-Id: Ic35af3464c0d9c1a9ef57f2b427f0a9fe2942fa3
Eugene Susla [Sat, 29 Jun 2019 03:30:08 +0000 (20:30 -0700)]
Merge "[DO NOT MERGE] Guard against launching permission backup/restore twice per request" into qt-dev
am:
40c5864445
Change-Id: I3c2e26e66681d6d5f3407635354f9e9b6926c789
Eugene Susla [Sat, 29 Jun 2019 03:30:06 +0000 (20:30 -0700)]
[DO NOT MERGE] Guard against launching permission backup/restore twice per request
am:
8c2fb0ea1e
Change-Id: I526a8f1798fedb38a1a276d8516a56f2d6d0dffb
TreeHugger Robot [Sat, 29 Jun 2019 03:28:31 +0000 (03:28 +0000)]
Merge "Disable historical appops" into qt-dev
TreeHugger Robot [Sat, 29 Jun 2019 02:56:35 +0000 (02:56 +0000)]
Merge "[DO NOT MERGE] Guard against launching permission backup/restore twice per request" into qt-dev
Wale Ogunwale [Sat, 29 Jun 2019 02:38:42 +0000 (19:38 -0700)]
Merge "Reland: Clear transitions for app windows display change." into qt-dev
am:
bf4eee2181
Change-Id: Iaa00b08d68fece06fbd58af10b988e60b2c468ec
TreeHugger Robot [Sat, 29 Jun 2019 01:49:22 +0000 (01:49 +0000)]
Merge "Reland: Clear transitions for app windows display change." into qt-dev
Bryan Ferris [Sat, 29 Jun 2019 00:55:50 +0000 (17:55 -0700)]
[automerger skipped] Merge "[RESTRICT AUTOMERGE] Correct argument order in permission check" into pi-dev am:
b2964b2956 -s ours
am:
8b98bdc834
Change-Id: I24041b45319d49a19b52f189bda07c322b02e99e
Bryan Ferris [Sat, 29 Jun 2019 00:39:07 +0000 (17:39 -0700)]
[automerger skipped] Merge "[RESTRICT AUTOMERGE] Correct argument order in permission check" into pi-dev
am:
b2964b2956 -s ours
am skip reason: subject contains skip directive
Change-Id: Ifd5eb4109d1eca28aee7004b0625f51b1c9d203b
Shuzhen Wang [Sat, 29 Jun 2019 00:33:50 +0000 (17:33 -0700)]
Merge "Camera: Clarify manual capture behavior for logical camera" into qt-dev
am:
6da414a8f6
Change-Id: Ic7abd99805b450f0a1d1acbd2a0cd03c185e3a83
Eugene Susla [Wed, 26 Jun 2019 22:47:44 +0000 (15:47 -0700)]
[DO NOT MERGE] Guard against launching permission backup/restore twice per request
It looks like there is some case where AbstractRemoteService would #run the
same PendingRequest the second time which violates AsyncTask assumption.
Fixes:
135986503
Test: atest android.permission.cts.PermissionControllerTest
Change-Id: I2d072714ee0fad3c365ff7eb191d690056c0931a
Lucas Dupin [Sat, 29 Jun 2019 00:13:34 +0000 (00:13 +0000)]
Merge "Do not unregister lift when prox is covered" into qt-r1-dev
Bryan Ferris [Fri, 28 Jun 2019 23:59:16 +0000 (23:59 +0000)]
Merge "[RESTRICT AUTOMERGE] Correct argument order in permission check" into pi-dev
TreeHugger Robot [Fri, 28 Jun 2019 23:54:09 +0000 (23:54 +0000)]
Merge "Camera: Clarify manual capture behavior for logical camera" into qt-dev
Mathew Inwood [Fri, 28 Jun 2019 20:18:28 +0000 (13:18 -0700)]
Merge "Restore some greylist entries." into qt-dev
am:
f4535c8d51
Change-Id: I9349026a5f99cb2ebac1d9fadd3c716e8a06aaa3
TreeHugger Robot [Fri, 28 Jun 2019 20:01:13 +0000 (20:01 +0000)]
Merge "Restore some greylist entries." into qt-dev
Lucas Dupin [Thu, 27 Jun 2019 23:10:19 +0000 (16:10 -0700)]
Do not unregister lift when prox is covered
The lift sensor won't receive all the data that it needs otherwise.
Test: atest DozeParametersTest
Test: lift while prox is covered
Test: lift while prox is covered, uncovering before end of gesture
Test: lift while prox is not covered
Fixes:
134685251
Change-Id: I0938baba6ccaaf04c40fe30b3f4f59293179dc2a
Fabian Kozynski [Fri, 28 Jun 2019 18:21:37 +0000 (18:21 +0000)]
Merge "Fixes for CBRS" into qt-r1-dev
Mehdi Alizadeh [Fri, 28 Jun 2019 01:06:15 +0000 (18:06 -0700)]
Persists share targets after reading from Apps xml resource
Bug:
136206375
Test: atest com.android.server.pm.ShortcutManagerTest1 \
com.android.server.pm.ShortcutManagerTest2 \
com.android.server.pm.ShortcutManagerTest3 \
com.android.server.pm.ShortcutManagerTest4 \
com.android.server.pm.ShortcutManagerTest5 \
com.android.server.pm.ShortcutManagerTest6 \
com.android.server.pm.ShortcutManagerTest7 \
com.android.server.pm.ShortcutManagerTest8 \
com.android.server.pm.ShortcutManagerTest9 \
com.android.server.pm.ShortcutManagerTest10
atest CtsShortcutHostTestCases
atest CtsShortcutManagerTestCases
Change-Id: I0c8b41453727f821f6e5cbc05d7fefd14dc646fc
Wale Ogunwale [Fri, 28 Jun 2019 15:19:25 +0000 (15:19 +0000)]
Reland: Clear transitions for app windows display change.
This prevents unwanted animations from running for windows on the new
display that are no longer relevant.
Also,
- Transfer the opening app token transition to the new display so that
it can be eventually made visible on that display
- Clean-up TODO relating to moving VR activity to main display, so that
the right states are set.
Bug:
128449959
Test: VrDisplayTests
Test: manual - launch activity with options moving between virtual and
default display, atest WmTests
Change-Id: I285c6742839d38e76322621b9c2a1d7f313cd6f8
TreeHugger Robot [Fri, 28 Jun 2019 17:53:38 +0000 (17:53 +0000)]
Merge "Return true if there were plugin sensors available" into qt-r1-dev
Andrew Sapperstein [Fri, 28 Jun 2019 17:32:14 +0000 (10:32 -0700)]
Merge "Allow granting URI permissions to com.android.settings.module_licenses." into qt-dev
am:
9dd0c5628b
Change-Id: Ibf712294cea1eeab1651d6f43b97e145b07d54c4
TreeHugger Robot [Fri, 28 Jun 2019 17:02:54 +0000 (17:02 +0000)]
Merge "DWB Bias splines ignore default ambient CCT" into qt-r1-dev
Andrew Sapperstein [Fri, 28 Jun 2019 16:56:04 +0000 (16:56 +0000)]
Merge "Allow granting URI permissions to com.android.settings.module_licenses." into qt-dev
Philip P. Moltmann [Thu, 27 Jun 2019 20:11:19 +0000 (13:11 -0700)]
Disable historical appops
Fixes:
133419419
Test: atest CtsAppOpsTestCases
Change-Id: I1790581b5ac6608c59d731d9d28110f125186a39
Merged-In: I6debd3cbb6768b256eb558a81ba13efea375769b
Jorim Jaggi [Fri, 28 Jun 2019 15:22:48 +0000 (08:22 -0700)]
Merge "GestureNav: Limit exclusion rects" into qt-dev
am:
ea3216d462
Change-Id: Iec5962ddf1dc34f24b99add93a65fc4f69debcde
Mathew Inwood [Fri, 28 Jun 2019 15:19:19 +0000 (08:19 -0700)]
Merge "Restore some greylist entries." into qt-dev
am:
f76bdce6e0
Change-Id: I7636cbdbd4177461c56103a6a8e7d87498c9ba13
Matt Pietal [Fri, 28 Jun 2019 15:15:45 +0000 (08:15 -0700)]
Merge "Resolver - Improve flow for Intent URL handling" into qt-dev
am:
d73543b588
Change-Id: Id1946ed17449c07c5384c03c61fe5b9f0e5530f8
Sanry Huang [Fri, 28 Jun 2019 15:07:42 +0000 (08:07 -0700)]
Merge "Use the real activity component to find reusable task" into qt-dev
am:
f0cea00104
Change-Id: I4328d604d205050ff6d6a5ce2475283e0febd34a
Jorim Jaggi [Fri, 28 Jun 2019 13:48:37 +0000 (13:48 +0000)]
Merge "GestureNav: Limit exclusion rects" into qt-dev
Beverly [Thu, 27 Jun 2019 18:17:21 +0000 (14:17 -0400)]
Return true if there were plugin sensors available
So listeners know whether if their sensor was
registered to any plugins.
Test: manual
Bug:
136108617
Change-Id: I8a9a03968efee8744ef610cabbfbfda3a08e386e
TreeHugger Robot [Fri, 28 Jun 2019 12:02:43 +0000 (12:02 +0000)]
Merge "Restore some greylist entries." into qt-dev
Matt Pietal [Fri, 28 Jun 2019 12:02:04 +0000 (12:02 +0000)]
Merge "Resolver - Improve flow for Intent URL handling" into qt-dev
Sanry Huang [Fri, 28 Jun 2019 11:07:49 +0000 (11:07 +0000)]
Merge "Use the real activity component to find reusable task" into qt-dev
Adrian Roos [Tue, 18 Jun 2019 14:13:53 +0000 (16:13 +0200)]
GestureNav: Limit exclusion rects
Add limits for system gesture exclusion on the left and right edges.
This prevents non-immersive-sticky apps from totally disabling the
back gesture.
Bug:
135522625
Test: atest SystemGestureExclusionRectsTest
Merged-In: Ib26161663a6aababe803d3c70044f4017bdbe675
Change-Id: Ib26161663a6aababe803d3c70044f4017bdbe675
Mathew Inwood [Fri, 28 Jun 2019 09:16:13 +0000 (10:16 +0100)]
Restore some greylist entries.
In Q, these APIs were either:
- removed from the greylist entirely without good reason
- Moved to the restricted greylist without any public alternative
information added
So they are being moved back to the greylist for Q.
Test: Treehugger
Bug:
136102585
Change-Id: Ie3dd15c8e17d530d853473a013717e6175383080
Mathew Inwood [Thu, 27 Jun 2019 11:47:38 +0000 (12:47 +0100)]
Restore some greylist entries.
In Q, these APIs were either:
- removed from the greylist entirely without good reason
- Moved to the restricted greylist without any public alternative
information added
So they are being moved back to the greylist for Q.
Test: Treehugger
Bug:
136102585
Change-Id: I5ac8b8b9b23c3789d80239cf456072cc7dfa1203
Bonian Chen [Fri, 28 Jun 2019 08:05:17 +0000 (08:05 +0000)]
Merge "[VoLTE short code] Enable ATT configuration on FirstNet" into qt-r1-dev
TreeHugger Robot [Fri, 28 Jun 2019 03:34:58 +0000 (03:34 +0000)]
Merge "Ensure that notifications don't wake the screen even when far away." into qt-r1-dev
Tej Singh [Fri, 28 Jun 2019 02:19:42 +0000 (19:19 -0700)]
Merge "StatsdStats: improve activation time logging" into qt-dev
am:
26b6ef7904
Change-Id: I6e92b0274e3a3266038fd91308818c56a83c29ca
TreeHugger Robot [Fri, 28 Jun 2019 02:03:40 +0000 (02:03 +0000)]
Merge "StatsdStats: improve activation time logging" into qt-dev
David Nelloms [Fri, 28 Jun 2019 01:05:42 +0000 (18:05 -0700)]
[automerger skipped] Merge "Notify on task display change." into qt-dev
am:
22a5e4e5d9 -s ours
am skip reason: change_id Idabad8379cded664bcf302d5c6fb69564d158eb7 with SHA1
1ceedb55d0 is in history
Change-Id: Ic9f2741b76bd20888252b3a9dd4a32807ff1f10a
Jaewan Kim [Fri, 28 Jun 2019 01:01:32 +0000 (18:01 -0700)]
Merge "Fallback to default volume handling when session is released" into qt-dev
am:
d1008f8339
Change-Id: I3f87bbb17dab637c43b4503ad28cf469835741c9
Anthony Han [Fri, 28 Jun 2019 00:27:24 +0000 (17:27 -0700)]
DWB Bias splines ignore default ambient CCT
When ambientColorTemperature is set to a default of -1.0f, ambient
brightness to bias splines should ignore this values instead of trying
to interpolate to towards an actual CCT.
Bug:
132047710
Test: atest AmbientLuxTest
Change-Id: Ic6da5f80d52a94a29795a76422cc1b964cdf261b
David Nelloms [Fri, 28 Jun 2019 00:12:49 +0000 (00:12 +0000)]
Merge "Notify on task display change." into qt-dev
TreeHugger Robot [Fri, 28 Jun 2019 00:12:47 +0000 (00:12 +0000)]
Merge "Fallback to default volume handling when session is released" into qt-dev
Hai Zhang [Fri, 28 Jun 2019 00:03:20 +0000 (17:03 -0700)]
Merge "Add link to AndroidX Role library in RoleManager documentation." into qt-dev
am:
bde371beb6
Change-Id: Ic746566fb2001d95a34fcfc4d8f1d0bbb0eda97f
TreeHugger Robot [Thu, 27 Jun 2019 23:28:54 +0000 (23:28 +0000)]
Merge "Add link to AndroidX Role library in RoleManager documentation." into qt-dev
Lucas Dupin [Thu, 27 Jun 2019 23:15:19 +0000 (23:15 +0000)]
Merge "Enable "lift to retry" on face-auth devices" into qt-r1-dev
Bryan Ferris [Thu, 27 Jun 2019 21:39:46 +0000 (14:39 -0700)]
[RESTRICT AUTOMERGE] Correct argument order in permission check
The function 'checkAccess' recieves the uid and pid in that order and
forwards them to checkSlicePermission in the same order. However,
checkSlicePermission expects them in the opposite order.
Bug:
135551349
Test: atest FrameworksUiServicesTests
Change-Id: I6e49efeab08f0e2a29d9830e6f81905598ae410c
Robert Snoeberger [Thu, 27 Jun 2019 20:50:37 +0000 (13:50 -0700)]
Merge "Disable custom clock faces in SystemUI" into qt-dev
am:
6613ea8da3
Change-Id: I4418cad82e478cc835da76dc5524bcbe23bdf592
TreeHugger Robot [Thu, 27 Jun 2019 20:15:27 +0000 (20:15 +0000)]
Merge "Import translations. DO NOT MERGE" into qt-r1-dev
TreeHugger Robot [Thu, 27 Jun 2019 20:09:06 +0000 (20:09 +0000)]
Merge "Disable custom clock faces in SystemUI" into qt-dev
Bill Yi [Thu, 27 Jun 2019 19:53:08 +0000 (12:53 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev
am:
949a22d754 -s ours
am skip reason: subject contains skip directive
Change-Id: I7fb9404482659f6428c8a0e5f2ebd80498e1147f
Dave Mankoff [Thu, 27 Jun 2019 19:17:42 +0000 (15:17 -0400)]
Ensure that notifications don't wake the screen even when far away.
This means that, with AOD on _and_ with the setting to wake the screen
for new notificdations, we still _don't_ wake the screen, if the
phone doesn't think someone is nearby.
Bug:
135452672
Test: manual.
Change-Id: Ie2ca292bd7eb092a78e6e264b0e75e42b39d577f
TreeHugger Robot [Thu, 27 Jun 2019 19:03:41 +0000 (19:03 +0000)]
Merge "Import translations. DO NOT MERGE" into qt-dev
davidln [Thu, 30 May 2019 21:25:01 +0000 (14:25 -0700)]
Notify on task display change.
This is a targeted fix for not receiving a task stack change callback
when a task with a resumed Activity is reparented to another display.
Bug:
128932906
Test: manual - launch activity from virtual display onto default display
in a new task, verify callback notified. atest WmTests
Change-Id: Idabad8379cded664bcf302d5c6fb69564d158eb7
Merged-In: Idabad8379cded664bcf302d5c6fb69564d158eb7
Lucas Dupin [Wed, 26 Jun 2019 23:32:56 +0000 (16:32 -0700)]
Enable "lift to retry" on face-auth devices
Test: lift from keyguard or bouncer
Test: list multiple times
Test: observe registration/cencellation when unlocking or sleeping
Fixes:
130327361
Change-Id: I8d17858555b56e1032e7c5de744a262c0d42a80a
Bill Yi [Thu, 27 Jun 2019 18:07:30 +0000 (11:07 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: Id9e6ec9c96b570ea54b78c426f3a6986c695d82b
Matt Pietal [Thu, 27 Jun 2019 17:27:52 +0000 (13:27 -0400)]
Resolver - Improve flow for Intent URL handling
When a URL is detected and all resolved targets are browsers, allow
the user to set a default browser from the Resolver. If one of the
options is an App and not a browser (as defined by
ResolveInfo.handleAllWebDataURI) then direct the user to the settings
page where they can make changes to set the default app for particular
URLs.
On the settings page, highlight the correct setting to change so it's
clear to the user.
Bug:
132071949
Test: Manually resolve URLs with multiple browsers and apps like Reddit/Twitter
Change-Id: Ib8f867a020ecfbb73fa5f1d7db84890c72e4842d
Shuzhen Wang [Wed, 26 Jun 2019 21:48:36 +0000 (14:48 -0700)]
Camera: Clarify manual capture behavior for logical camera
Test: Build and read docs
Bug:
136098496
Change-Id: I4a2e9ac66ef79379b9c50932ddc845f56d7d01b4
Bill Yi [Thu, 27 Jun 2019 17:26:09 +0000 (10:26 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I87c000f8ff618d504391218ad0bb13b78312d029
Hyunyoung Song [Thu, 27 Jun 2019 16:53:29 +0000 (16:53 +0000)]
Merge "Transfer focus to open panel" into qt-r1-dev
Bonian Chen [Thu, 13 Jun 2019 09:36:48 +0000 (17:36 +0800)]
[VoLTE short code] Enable ATT configuration on FirstNet
FirstNet is MVNO of ATT, need same configuration for short code to pass
lab test case LTE-BTR-5-5464.1.
Bug: b/
130183057
Test: Testing ROM has been verified in lab.
Change-Id: I44534733bba5d522abb7d4fd1836881e995cb870
Tim Joines [Thu, 27 Jun 2019 16:22:21 +0000 (09:22 -0700)]
Merge "Disable USAP by default on devices" into qt-dev
am:
6c3bbf9e93
Change-Id: I131b75b45e43b185266ebb54f49815896fc67ffe
Peiyong Lin [Thu, 27 Jun 2019 16:14:02 +0000 (16:14 +0000)]
Merge "Attach color space information when attach and queue buffer." into qt-r1-dev
Tim Joines [Thu, 27 Jun 2019 16:01:43 +0000 (16:01 +0000)]
Merge "Disable USAP by default on devices" into qt-dev
Robert Snoeberger [Thu, 27 Jun 2019 14:31:09 +0000 (10:31 -0400)]
Disable custom clock faces in SystemUI
This will prevent custom clocks from persisting on dogfooders devices.
Bug:
136090066
Test: `adb shell settings put secure lock_screen_custom_clock_face
"com.android.keyguard.clock.BubbleClockController"` doesn't switch to
Bubble clock.
Change-Id: If9fc43295380d0bc37ca3df4c7187bd4faaf4bde
Jorim Jaggi [Thu, 27 Jun 2019 11:28:14 +0000 (04:28 -0700)]
Request invalidate root when legacy nav bar bg changes
am:
6482df5602
Change-Id: Ie6820d914340c7c87d0647bbeea96738abd6a0f8
Jorim Jaggi [Wed, 26 Jun 2019 15:35:32 +0000 (17:35 +0200)]
Request invalidate root when legacy nav bar bg changes
...because only invalidating the root window node will ensure that
onPostDraw() will be called again.
Test: Open com.planeth.rhythm
Fixes:
135207159
Change-Id: I03f814eb7435d91287968f3dcb72f579ab4a35ed
Lucas Dupin [Thu, 27 Jun 2019 08:26:38 +0000 (01:26 -0700)]
Merge "Avoid stuck wake-locks" into qt-dev
am:
13775aa4bb
Change-Id: I0db38fdb7a757510f1f24d981c66b387c6596871
TreeHugger Robot [Thu, 27 Jun 2019 08:00:00 +0000 (08:00 +0000)]
Merge "Avoid stuck wake-locks" into qt-dev
Ahan Wu [Thu, 27 Jun 2019 07:49:57 +0000 (00:49 -0700)]
Merge "Move image wallpaper rendering works to background thread." into qt-dev
am:
84ed5df87f
Change-Id: Id7b816deec2b048e5f6fd641ed44de1ca23c91ff
TreeHugger Robot [Thu, 27 Jun 2019 07:24:17 +0000 (07:24 +0000)]
Merge "Move image wallpaper rendering works to background thread." into qt-dev
Edgar Wang [Thu, 27 Jun 2019 06:36:34 +0000 (06:36 +0000)]
Merge "Allow wake_lock_screen when AOD is off" into qt-r1-dev
Arthur Hung [Thu, 27 Jun 2019 06:07:41 +0000 (23:07 -0700)]
Merge "Fix WindowFocusTests#testTapNonFocusableWindow failed" into qt-dev
am:
de5b1d3805
Change-Id: I5212af3e21819580c4cfaba0a202a568798e37ed
TreeHugger Robot [Thu, 27 Jun 2019 05:29:36 +0000 (05:29 +0000)]
Merge "Fix WindowFocusTests#testTapNonFocusableWindow failed" into qt-dev
Lucas Dupin [Wed, 26 Jun 2019 20:23:22 +0000 (13:23 -0700)]
Avoid stuck wake-locks
By having a maximum timeout.
Test: atest WakeLockTest
Fixes:
136001054
Fixes:
135881494
Change-Id: Ie189809191890213ea79f15e76bc1461a3445641
Lucas Dupin [Thu, 27 Jun 2019 04:41:42 +0000 (04:41 +0000)]
Merge "LockIcon fixes" into qt-r1-dev
Makoto Onuki [Thu, 27 Jun 2019 03:41:18 +0000 (20:41 -0700)]
Merge "Remove STOPSHOP, disable DEBUG_ANR" into qt-dev
am:
73e6028ea0
Change-Id: I1fa6dad04efaba2e473c10048bc1494ab0e1337f
Robert Snoeberger [Thu, 27 Jun 2019 03:27:38 +0000 (20:27 -0700)]
Merge "Disable ClockOptionsProvider so clocks don't appear in picker app" into qt-dev
am:
386f09235d
Change-Id: I839b678103da057bbe21dd03dc818a5758b714cb
Eugene Susla [Thu, 27 Jun 2019 03:23:27 +0000 (20:23 -0700)]
Merge "Don't throw from PooledLambda#toString" into qt-dev
am:
667d2c91bc
Change-Id: I4349da2e77a03c31875e46e80539247f3754e2af
TreeHugger Robot [Thu, 27 Jun 2019 03:18:59 +0000 (03:18 +0000)]
Merge "Remove STOPSHOP, disable DEBUG_ANR" into qt-dev
Philip P. Moltmann [Thu, 27 Jun 2019 03:11:30 +0000 (20:11 -0700)]
Merge "Set most leniant mode if two perms affect one appop" into qt-dev
am:
d84102bf9e
Change-Id: I53023c0d749473f59aa8f80a83daab30630318a6
Hongwei Wang [Thu, 27 Jun 2019 03:08:31 +0000 (20:08 -0700)]
Merge "Comparing dimension and rotation instead of DisplayInfo" into qt-dev
am:
50ab7b076d
Change-Id: Icea4c88dfd08f9c8bc9b80a6fdfcbaea49c92313
Christopher Tate [Thu, 27 Jun 2019 03:07:20 +0000 (20:07 -0700)]
Merge "Defer PSS collection while an activity is starting" into qt-dev
am:
94f0c20ee9
Change-Id: I4a74a24b436bfd8d160c147c50acb3c50ebe5d35
Amith Yamasani [Thu, 27 Jun 2019 03:05:43 +0000 (20:05 -0700)]
Merge "Fix a regression in setting oom_adj for cached processes" into qt-dev
am:
4025715b3e
Change-Id: Ic9f15ba600f34307d31c88eb11017e5a59f79ea8
Govinda Wasserman [Thu, 27 Jun 2019 02:26:21 +0000 (02:26 +0000)]
Merge "[DO NOT MERGE] resolve merge conflicts of
079d81a4799a75e03a19148ed287e491142dd4c7 to qt-r1-dev" into qt-r1-dev
TreeHugger Robot [Thu, 27 Jun 2019 01:47:41 +0000 (01:47 +0000)]
Merge "Disable ClockOptionsProvider so clocks don't appear in picker app" into qt-dev
Lucas Dupin [Wed, 26 Jun 2019 02:52:26 +0000 (19:52 -0700)]
LockIcon fixes
Gather state inisitally, then consolidate it on a pre-draw listener.
Before we were deciding when to change the icon based on various
variables, now I'm centralizing the decision on getState(), to avoid
cancelling animations.
Test: At AOD2, lock animates in
Test: When locked, press power button: lock icon animates in
Test: Press power button: lock icon animates in scanning and unlocks
Test: Unlock without bypassing, let device sleep, go to AOD2
Test: Long press padlock when it's open
Test: Look at padlock from SIM PIN screen
Test: Look at padlock when lock screen is not secure (no pin/pwd)
Fixes:
135587352
Fixes:
135960400
Change-Id: I85260b6c373d675bd6076046e33519816221157f
Louis Chang [Tue, 25 Jun 2019 03:56:55 +0000 (11:56 +0800)]
Use the real activity component to find reusable task
The resolved target component was not save in task intent when an alias
activity was started. When starting alias activity again, the target
component was different from the alias component name which stored in
the task. So, we were unable to find a reusable task if the task was on
other display.
Bug:
135738129
Test: atest ActivityStackTests
Change-Id: I87249b6909eab9cd381f9de01b9c0edb32f2ae70
Arthur Hung [Tue, 25 Jun 2019 09:59:39 +0000 (17:59 +0800)]
Fix WindowFocusTests#testTapNonFocusableWindow failed
If the touched window can't gain focus, should ignore
set focus to display and task.
Bug:
135899255
Test: atest WindowFocusTests#testTapNonFocusableWindow
Change-Id: Ibd23d4cac9cf1f346f36c83ac66d650a54f8461d
(cherry picked from commit
4e6e0ec60c1b8f9d90380bb5c550a63f1663ad94)
TreeHugger Robot [Thu, 27 Jun 2019 00:51:27 +0000 (00:51 +0000)]
Merge "Don't throw from PooledLambda#toString" into qt-dev
TreeHugger Robot [Thu, 27 Jun 2019 00:20:45 +0000 (00:20 +0000)]
Merge "Set most leniant mode if two perms affect one appop" into qt-dev
Hai Zhang [Tue, 25 Jun 2019 00:15:39 +0000 (17:15 -0700)]
Add link to AndroidX Role library in RoleManager documentation.
Fixes:
136119951
Test: presubmit
Change-Id: Iab4c8617983555b04d7c49b7f9583cf2132d57c8
Eugene Susla [Wed, 26 Jun 2019 22:06:31 +0000 (15:06 -0700)]
Don't throw from PooledLambda#toString
Turns out there was one more place b/
134594642#comment23
Fixes:
134594642
Test: presubmit
Change-Id: I602569c6dd0632641215a7482def2987e10701b2
Hongwei Wang [Wed, 26 Jun 2019 21:52:30 +0000 (21:52 +0000)]
Merge "Comparing dimension and rotation instead of DisplayInfo" into qt-dev
TreeHugger Robot [Wed, 26 Jun 2019 21:48:43 +0000 (21:48 +0000)]
Merge "Reduce floating point error in PerimeterPathGuide." into qt-r1-dev