Hongwei Wang
2ed6d3891b
Merge "Restrict the overridden min size for PiP" into rvc-dev
2021-03-03 23:01:26 +00:00
Beth Thibodeau
542be62b05
Merge "Limit maximum allowed size for a status bar icon" into rvc-dev
2021-03-03 20:53:01 +00:00
Hongwei Wang
2a18b15dfb
Restrict the overridden min size for PiP
...
Per go/cdd-proposal-pip-size, the absolute minimum size when overridden
should be 48dp.
Bug: 174302616
Test: atest PinnedStackTests#testEnterPipWithTinyMinimalSize
Merged-In: I2f0dfd9a79049aaf696fde8703994deaecce63f5
Change-Id: I2f0dfd9a79049aaf696fde8703994deaecce63f5
2021-03-03 11:37:19 -08:00
Patrick Baumann
649d086c2c
Merge "Adds caller check to getAllPackages()" into rvc-dev
2021-03-03 18:18:56 +00:00
Jonathan Scott
91ceae3ef7
Merge "[RESTRICT AUTOMERGE] Use userId instead of USER_CURRENT in shouldLockKeyguard." into rvc-dev
2021-03-03 16:25:51 +00:00
yawanng
9b694ef4d4
Adds caller check to getAllPackages()
...
This change enforces that only system, root or shell may call
getAllPackages(), a hidden API that shares all package names regardless
of user, instant app or package visibility rules.
The only exception is the uid of iorapd. iorapd needs the package info
to prefetch the right data.
Bug: 179618216
Bug: 174661955
Test: run iorapd and check it works well.
Change-Id: I77460ae19a4d41151577646441f11e2eddbb741a
(cherry picked from commit 8124efd57b )
2021-02-18 18:19:44 +00:00
TreeHugger Robot
3516e98daa
Merge changes from topic "cdm_overlay-oc-mr1-dev" into oc-mr1-dev am: 5382574928 am: 0847618070 am: 77d6da8435 am: 88ad6db9f3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13180989
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I97e2cfb8ccae18862b73fc4360016abfe1aa6613
2021-02-09 23:41:02 +00:00
Eugene Susla
6766245f10
[automerger skipped] RESTRICT AUTOMERGE am: 6a5777dd50 -s ours am: 80d043197c -s ours am: 4a510d0fc5 am: 3f1fb6507a -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13180989
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I689d2e339d23f8dd2b08f360d27d8520be5c41c2
2021-02-09 23:40:58 +00:00
TreeHugger Robot
8eef0f9d26
Merge changes from topic "cdm_overlay-qt-dev" into qt-dev am: 6759663285 am: a964117367
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13181018
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I22ef7c07d5e7a7284810aff3f5308fcacb1f6b2c
2021-02-09 23:40:38 +00:00
Eugene Susla
3c24d07dfb
[automerger skipped] RESTRICT AUTOMERGE am: 30e9d28c22 am: 4d587c5aa9 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13181018
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I8bc4d6f366fab119da399da1a1a37024c4717dde
2021-02-09 23:40:28 +00:00
Michael Groover
ebde0f1f40
[automerger skipped] resolve merge conflicts of 540b50bbe7 to qt-qpr1-dev am: 8750762ce0 -s ours
...
am skip reason: Change-Id I9b8786a321b1ba79d81b74c3041589f30df8e9c8 with SHA-1 a953322575 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13518142
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Id982e8e6f2931509943c5d8e0f77202d04183c9e
2021-02-09 23:40:02 +00:00
TreeHugger Robot
88ad6db9f3
Merge changes from topic "cdm_overlay-oc-mr1-dev" into oc-mr1-dev am: 5382574928 am: 0847618070 am: 77d6da8435
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13180989
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I4952f07571992a24f29a80063cd205b54592a5a1
2021-02-09 23:01:41 +00:00
Eugene Susla
3f1fb6507a
[automerger skipped] RESTRICT AUTOMERGE am: 6a5777dd50 -s ours am: 80d043197c -s ours am: 4a510d0fc5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13180989
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I51e17655a64f6d3c6ed5a8eac5a22d6eebb68c38
2021-02-09 23:01:36 +00:00
TreeHugger Robot
a964117367
Merge changes from topic "cdm_overlay-qt-dev" into qt-dev am: 6759663285
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13181018
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I365cb6b774ccb9a4d73654b73bfde00ef2eaf327
2021-02-09 23:01:16 +00:00
Eugene Susla
4d587c5aa9
RESTRICT AUTOMERGE am: 30e9d28c22
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13181018
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ia0ce89b57ab01e6316b5cad5854b26624b460043
2021-02-09 23:01:14 +00:00
Michael Groover
8750762ce0
resolve merge conflicts of 540b50bbe7 to qt-qpr1-dev
...
Bug: 173421434
Change-Id: Ie3b327c2ab900616b2137d8347d5e8560484ec40
Merged-In: I9b8786a321b1ba79d81b74c3041589f30df8e9c8
2021-02-08 20:23:21 +00:00
TreeHugger Robot
2fffbcb7df
[automerger skipped] Merge "resolve merge conflicts of a13fc7f314 to qt-qpr1-dev" into qt-qpr1-dev am: 6d4ff2e0f0 -s ours
...
am skip reason: Change-Id I03072c65e1c7101538a7a20541d2ac59a2d213e3 with SHA-1 296fea7448 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13464421
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I409002a313787764b16cb23080c38e9273104638
2021-02-08 17:23:08 +00:00
TreeHugger Robot
6d4ff2e0f0
Merge "resolve merge conflicts of a13fc7f314 to qt-qpr1-dev" into qt-qpr1-dev
2021-02-08 17:00:32 +00:00
Michael Groover
9b85c6411e
resolve merge conflicts of a13fc7f314 to qt-qpr1-dev
...
Bug: 173421434
Change-Id: Ia5912645861a88e819189321861ffd81240c34d6
Merged-In: I03072c65e1c7101538a7a20541d2ac59a2d213e3
2021-02-05 23:57:15 +00:00
Evan Laird
24a1d2c990
DO NOT MERGE: Associate notif cancels with notif posts
...
CancelNotificationRunnables just spin on the work handler of
NotificationManagerService, hoping that they get executed at the correct
moment after a PostNotificationRunnable and before the next
EnqueueNotificationRunnable completes. Otherwise, you end up in a bad
state where the cancel either is canceling notifications before they get
a chance to post, or missing its only chance to cancel the notification
(for instance, ActivityManagerService is the only caller that can cancel
FGS notifications).
This change attempts to execute a CancelNotificationRunnable at the
moment its run() method is called, otherwise it associates the runnable
with the latest enqueued notificaiton record which has yet to post.
It then associates PostNotificationRunnable with the delayed cancel
list, executing any missed cancel operations immediately upon finishing
the PostNotificationRunnable.
Test: atest SystemUITests NotificationManagerServiceTest; manual
Bug: 162652224
Bug: 119041698
Change-Id: I88d3c5f4fd910a83974c2f84ae3e8a9498d18133
2021-02-03 15:53:58 -05:00
Miranda Kephart
ec9dd28b39
Merge "[DO NOT MERGE] Close screenshot process on user switched" into rvc-dev
2021-02-03 16:00:14 +00:00
Miranda Kephart
3687a2834e
[automerger skipped] Merge "[DO NOT MERGE] Close screenshot process on user switched" into qt-qpr1-dev am: 21eb07cfd0 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13420830
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I06660d88e828c78714065433895b5540676b9656
2021-02-03 15:02:54 +00:00
Miranda Kephart
a5141a4b96
[DO NOT MERGE] Close screenshot process on user switched
...
Currently, we keep the process up even if the user switches,
meaning that in some cases (if the user is switched while the
screenshot UI is up) we will save images to the wrong profile.
This change makes ScreenshotHelper listen for user switches and
close the screenshot service, so that a new screenshot is
guaranteed to be constructed with the correct user's context.
Bug: 170474245
Fix: 170474245
Test: manual -- verified bad state occurs if user switches within
the timeout period, ensured that screenshots work immediately
after switching with this change.
Change-Id: I9d32d0928e6c2bda161d04555438d0dd7afef0ba
(cherry picked from commit 7ef1a5dd15 )
2021-02-03 14:29:12 +00:00
Miranda Kephart
21eb07cfd0
Merge "[DO NOT MERGE] Close screenshot process on user switched" into qt-qpr1-dev
2021-02-03 14:28:27 +00:00
TreeHugger Robot
77d6da8435
Merge changes from topic "cdm_overlay-oc-mr1-dev" into oc-mr1-dev am: 5382574928 am: 0847618070
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13180989
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ib1166627468f5d11aef69301318658eb7f4aae84
2021-02-03 02:19:41 +00:00
Eugene Susla
4a510d0fc5
[automerger skipped] RESTRICT AUTOMERGE am: 6a5777dd50 -s ours am: 80d043197c -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13180989
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ia27241123b2266977e887afd36f17ceae35c8c2b
2021-02-03 02:19:36 +00:00
TreeHugger Robot
6759663285
Merge changes from topic "cdm_overlay-qt-dev" into qt-dev
...
* changes:
RESTRICT AUTOMERGE Allow CDM to hide overlays
RESTRICT AUTOMERGE Prevent non-system overlays from showing over CDM UI
2021-02-03 01:36:09 +00:00
TreeHugger Robot
0847618070
Merge changes from topic "cdm_overlay-oc-mr1-dev" into oc-mr1-dev am: 5382574928
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13180989
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I8033d0e1c60c957aa149c052dd1ba653f5449d5d
2021-02-03 01:33:51 +00:00
Eugene Susla
80d043197c
[automerger skipped] RESTRICT AUTOMERGE am: 6a5777dd50 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13180989
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ia736a9acfe1f91e2a8d86cb8b7221a1472e5195f
2021-02-03 01:33:43 +00:00
TreeHugger Robot
5382574928
Merge changes from topic "cdm_overlay-oc-mr1-dev" into oc-mr1-dev
...
* changes:
RESTRICT AUTOMERGE Allow CDM to hide overlays
RESTRICT AUTOMERGE Prevent non-system overlays from showing over CDM UI
2021-02-03 01:07:11 +00:00
TreeHugger Robot
f82228a753
Merge changes from topic "cdm_overlay-rvc-dev" into rvc-dev
...
* changes:
Allow CDM to hide overlays
Prevent non-system overlays from showing over CDM UI
2021-02-03 00:48:45 +00:00
TreeHugger Robot
5d559ac700
Merge "Fix thread safety issue on clearing cache" into rvc-dev
2021-02-03 00:16:26 +00:00
Michael Groover
540b50bbe7
Merge changes from topic "173421434-SubInfo-ICCID-qt-dev" into qt-dev
...
* changes:
Add method to clear out SubscriptionInfo#getCardString
Whitelist READ_PRIVILEGED_PHONE_STATE for the contacts provider
Update the getIccId docs to reflect access requirements
2021-02-03 00:02:52 +00:00
TreeHugger Robot
519201b871
Merge changes from topic "cdm_overlay-pi-dev" into pi-dev am: 99e5a28c5b am: 260d69a4d5 am: 82b0600bfe
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13180987
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I18cb7361ca96526aa490e5e5be697e8f9f5660b8
2021-02-02 23:50:06 +00:00
Eugene Susla
282a2a51b4
[automerger skipped] RESTRICT AUTOMERGE am: 486773ff45 -s ours am: 56cc3b82c2 am: 175d275bb9 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13180987
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ib8d440710fb9aa9a206b6da61af96c2eb53fac63
2021-02-02 23:50:02 +00:00
TreeHugger Robot
82b0600bfe
Merge changes from topic "cdm_overlay-pi-dev" into pi-dev am: 99e5a28c5b am: 260d69a4d5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13180987
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I64ece3292d6cd088455547b0365ea4ffc8e6378c
2021-02-02 23:49:50 +00:00
Eugene Susla
175d275bb9
[automerger skipped] RESTRICT AUTOMERGE am: 486773ff45 -s ours am: 56cc3b82c2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13180987
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I1bdb66b2c06a2a1ae249c0eb31dac2ae8101fbbb
2021-02-02 23:49:46 +00:00
TreeHugger Robot
0debf904b1
[automerger skipped] Merge "[SettingsProvider] extend font size scale range" into qt-dev am: a9638beba3 -s ours am: 146953dfff -s ours
...
am skip reason: Change-Id Icff82d727d63da4353342b0f9a5ca3c2ae1671c1 with SHA-1 9b6c0faca3 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13370383
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: If34ea04b7480c79673ee9657abc59ab799f0a039
2021-02-02 23:49:43 +00:00
TreeHugger Robot
260d69a4d5
Merge changes from topic "cdm_overlay-pi-dev" into pi-dev am: 99e5a28c5b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13180987
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I4dc66b1d02903fbf4bdbd6053787168281bedcd6
2021-02-02 23:30:04 +00:00
Eugene Susla
56cc3b82c2
[automerger skipped] RESTRICT AUTOMERGE am: 486773ff45 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13180987
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I59451725f8eea4a9a6587d7f8d3272a24ee486e4
2021-02-02 23:29:59 +00:00
TreeHugger Robot
146953dfff
[automerger skipped] Merge "[SettingsProvider] extend font size scale range" into qt-dev am: a9638beba3 -s ours
...
am skip reason: Change-Id Icff82d727d63da4353342b0f9a5ca3c2ae1671c1 with SHA-1 b7d4c8098d is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13370383
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I2843e5d6ac13dc77185a4ab5647c521042656b57
2021-02-02 23:28:19 +00:00
TreeHugger Robot
45faf04f53
[automerger skipped] Merge "[SettingsProvider] extend font size scale range" into qt-qpr1-dev am: 4097309ffc -s ours
...
am skip reason: Change-Id Icff82d727d63da4353342b0f9a5ca3c2ae1671c1 with SHA-1 9b6c0faca3 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13370393
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I7e95a44cc6f421d454f7d42e538a8f25c1d29471
2021-02-02 23:28:13 +00:00
TreeHugger Robot
99e5a28c5b
Merge changes from topic "cdm_overlay-pi-dev" into pi-dev
...
* changes:
RESTRICT AUTOMERGE Allow CDM to hide overlays
RESTRICT AUTOMERGE Prevent non-system overlays from showing over CDM UI
2021-02-02 23:03:57 +00:00
TreeHugger Robot
e42ea74fb1
Merge "[SettingsProvider] extend font size scale range" into rvc-dev
2021-02-02 22:37:12 +00:00
TreeHugger Robot
4097309ffc
Merge "[SettingsProvider] extend font size scale range" into qt-qpr1-dev
2021-02-02 22:36:47 +00:00
TreeHugger Robot
a9638beba3
Merge "[SettingsProvider] extend font size scale range" into qt-dev
2021-02-02 22:36:24 +00:00
Jonathan Scott
7a974a5468
[RESTRICT AUTOMERGE] Use userId instead of USER_CURRENT in shouldLockKeyguard.
...
USER_CURRENT is not an acceptable input to isSecure(). The test has also
been updated as the use of any() for the mock hid this bug.
Test: atest LockTaskControllerTest
Bug: 176801033
Change-Id: Ic080eddb04ce9c20ebb6118abe8a48d28c7f67e5
2021-02-01 17:51:13 +00:00
Muhammad Qureshi
0992a32def
Merge "[RESTRICT AUTOMERGE] Fix potential out of bounds writes in LogEvent." into rvc-dev
2021-01-30 02:00:56 +00:00
TreeHugger Robot
274863f9d5
Merge "Only update native InputApplicationHandle once" into rvc-dev
2021-01-30 00:06:35 +00:00
TreeHugger Robot
a297374f96
[automerger skipped] Merge "Only allow BROWSABLE && DEFAULT Intents to be always opened" into pi-dev am: 47fb5ee20c -s ours am: 589f538708 -s ours am: 06985dae13 -s ours
...
am skip reason: Change-Id Ib957258735893bf2779bed19bd400c6726ee6478 with SHA-1 5a90c4c75b is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13307947
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I484faf2bfa16a82b32781b9afa6d0d2ca2bef8de
2021-01-29 21:37:28 +00:00