Kweku Adams
807dab2cb3
Only clear preferred UID at appropriate times.
...
The preferred UID is set when we call
JobServiceContext.cancel(...PREEMPT), so clearing the preferred UID
before that call is pointless. Also, make sure not to clear the
preferred for contexts that are only going to be used to transfer jobs
to the preferred UID.
Bug: 141645789
Bug: 204924801
Test: Android builds
Change-Id: I18db34a389919432b604d68f90a6901d9e6f9cba
2022-03-25 20:15:52 +00:00
Miranda Kephart
c88a1ff323
Merge "Express default copy/paste dismiss velocity in dp" into tm-dev
2022-03-25 14:49:55 +00:00
Miranda Kephart
2a94c0af0b
Merge "Fix clipboard dismiss button text color in dark mode" into tm-dev
2022-03-25 14:49:06 +00:00
Kweku Adams
a4a72f28b3
Merge "Keep oom_adj score low for top started EJs." into tm-dev
2022-03-25 14:48:55 +00:00
Miranda Kephart
20b4989d0c
Merge "Set package name explicitly when sending copy intent" into tm-dev
2022-03-25 14:47:31 +00:00
PETER LIANG
277ed260e4
Merge "Fix that holding volume buttons to activate Extra dim feature doesn't do anything." into tm-dev
2022-03-25 14:06:00 +00:00
Robert Horvath
9d55afe25d
Merge "Prevent ArrayList allocation for prefer keep clear areas" into tm-dev
2022-03-25 13:57:41 +00:00
Ayush Sharma
c5f7947c18
[automerger skipped] Fix security hole in GateKeeperResponse am: 5d2176df69 am: 25356fba35 am: 936c9f03ea am: 9f080a0345 -s ours
...
am skip reason: Merged-In Ida28d611edd674e76ed39dd8037f52abcba82586 with SHA-1 46653a91c3 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17343385
Change-Id: I33d34a3b12fa1bd7d1aa39d720f035bdcb02877f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-25 13:22:16 +00:00
Baligh Uddin
f5db132e49
Merge "Changing apk name in the manifest and the corresponding packages." into tm-dev
2022-03-25 13:12:10 +00:00
Ayush Sharma
9f080a0345
Fix security hole in GateKeeperResponse am: 5d2176df69 am: 25356fba35 am: 936c9f03ea
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17343385
Change-Id: I22d92503039e830328e6a22a724aeb1286730108
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-25 13:06:56 +00:00
Ayush Sharma
936c9f03ea
Fix security hole in GateKeeperResponse am: 5d2176df69 am: 25356fba35
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17343385
Change-Id: I440c492f0199a89f61356c21cc0f0be8d0649199
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-25 12:54:22 +00:00
Ayush Sharma
9666473f16
[automerger skipped] Fix security hole in GateKeeperResponse am: 5d2176df69 am: 8feea3a186 -s ours
...
am skip reason: Merged-In Ida28d611edd674e76ed39dd8037f52abcba82586 with SHA-1 46653a91c3 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17343385
Change-Id: Ia97c0894f962af7514323b4ee5d23d3a6567d7fd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-25 12:54:13 +00:00
TreeHugger Robot
e5f832f8e5
[automerger skipped] Merge "Use flag to control the restart period value." into sc-v2-dev am: d3e2ea81f2 am: 276862cf94 -s ours
...
am skip reason: Merged-In Icd8d19c2a482d0d6b9bf0432e2176ca10f3bd2eb with SHA-1 46e6944804 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17344416
Change-Id: I98abf26d89882fef878c2f7aeddd38286db6c0da
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-25 12:53:09 +00:00
Ayush Sharma
25356fba35
Fix security hole in GateKeeperResponse am: 5d2176df69
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17343385
Change-Id: Iaa20c957e0944a9ce72c1584d93c352d7ffeee40
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-25 12:35:07 +00:00
Ayush Sharma
8feea3a186
Fix security hole in GateKeeperResponse am: 5d2176df69
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17343385
Change-Id: I25eac3659a0c3b0d7c3bf3c53c7e3f503966031f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-25 12:34:16 +00:00
TreeHugger Robot
276862cf94
Merge "Use flag to control the restart period value." into sc-v2-dev am: d3e2ea81f2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17344416
Change-Id: Iaca5fda743044360512e7742522b1f5e94c4b862
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-25 12:34:05 +00:00
TreeHugger Robot
d3e2ea81f2
Merge "Use flag to control the restart period value." into sc-v2-dev
2022-03-25 12:13:19 +00:00
Shiwangi Shah
b24001b123
Merge "Allow unexported receiver registration for sandbox" into tm-dev
2022-03-25 11:48:58 +00:00
Remi NGUYEN VAN
d6474d0e4f
Merge changes from topic "conn_t_move_tmdev" into tm-dev
...
* changes:
Remove stale aidl-export references
Move ConnectivityT to packages/modules
2022-03-25 11:19:02 +00:00
Joanne Chung
9b75fdcf80
[automerger skipped] Merge "Trusted Hotword: Allow disabling periodic restarts." into sc-v2-dev am: c1840b3fd5 -s ours am: e7b4cbc1a1 -s ours
...
am skip reason: Merged-In I3b17b47fab4120b42d75443b213be3c1ef5491aa with SHA-1 fc651fe0d2 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17344015
Change-Id: I37eb065e8677dc96a4302467e344953aceb8f111
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-25 11:14:49 +00:00
Joanne Chung
69514682c2
[automerger skipped] Merge changes from topic "presubmit-am-0527d8f1cf0a4d4ba0831323b572842f-sc-v2-dev" into sc-v2-dev-plus-aosp am: a719a69404 -s ours
...
am skip reason: Merged-In I3b17b47fab4120b42d75443b213be3c1ef5491aa with SHA-1 b8cd0a4286 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17344015
Change-Id: I79f3e31666fe24ae5281296578bdcfa0961613f9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-25 11:14:13 +00:00
Presubmit Automerger Backend
4b6f2150b8
[automerger skipped] [automerge] Trusted Hotword: Allow disabling periodic restarts. 2p: fc651fe0d2 am: 59ed3fba9a -s ours
...
am skip reason: Merged-In I3b17b47fab4120b42d75443b213be3c1ef5491aa with SHA-1 b8cd0a4286 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17344015
Change-Id: I2a97030f73cb880710e4989a37321cbcc7097c76
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-25 11:14:00 +00:00
Joanne Chung
e7b4cbc1a1
[automerger skipped] Merge "Trusted Hotword: Allow disabling periodic restarts." into sc-v2-dev am: c1840b3fd5 -s ours
...
am skip reason: Merged-In I3b17b47fab4120b42d75443b213be3c1ef5491aa with SHA-1 fc651fe0d2 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17344015
Change-Id: I210ba0fdacd35ae47c02f31311fb48fd7db8ce2e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-25 11:13:58 +00:00
Joanne Chung
c1840b3fd5
Merge "Trusted Hotword: Allow disabling periodic restarts." into sc-v2-dev
2022-03-25 10:54:51 +00:00
Joanne Chung
a719a69404
Merge changes from topic "presubmit-am-0527d8f1cf0a4d4ba0831323b572842f-sc-v2-dev" into sc-v2-dev-plus-aosp
...
* changes:
[automerge] Trusted Hotword: Allow disabling periodic restarts. 2p: fc651fe0d2
Trusted Hotword: Allow disabling periodic restarts.
2022-03-25 10:54:51 +00:00
Tiger Huang
d5d86912aa
Merge "Check mAttachInfo.mSystemUiVisibility to see if a SysUI flag exists" into tm-dev
2022-03-25 10:30:49 +00:00
Nick Chameyev
54c3d1b82e
Merge "Continue folding animation after it cancelled if necessary" into tm-dev
2022-03-25 10:28:40 +00:00
Kyunglyul Hyun
5c2bad1c59
Merge "Set audio route name when LE audio device is connected" am: dd1a3bae15 am: 0ef7fe46ad am: 716f23d92f
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2038603
Change-Id: I1576576cf0146230f680ba954f5d5107df379aa2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-25 10:26:02 +00:00
Christian Göllner
6e322a23e9
Merge "[Motion] Split-shade transition on LS: cross-fade status bars" into tm-dev
2022-03-25 10:25:34 +00:00
Mark Chien
157f669633
Merge "Rename updateFirewallRule to setUidFirewallRule" into tm-dev
2022-03-25 10:14:28 +00:00
Rubin Xu
498f7bf260
Merge "device policy: ignore unknown permission in setPermissionGrantState" into tm-dev
2022-03-25 10:12:43 +00:00
Piotr Wilczyński
a3a39631e9
Merge "More initialisation for external displays Change the FLAG_DEFAULT_DISPLAY to FLAG_SUPPORTS_DEFAULT_DISPLAY When the default display of the default layout is removed, find another display and make it default" into tm-dev
2022-03-25 10:07:55 +00:00
Kyunglyul Hyun
716f23d92f
Merge "Set audio route name when LE audio device is connected" am: dd1a3bae15 am: 0ef7fe46ad
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2038603
Change-Id: I219e7d25f32e8d469deaa0c68dad16dc89616a14
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-25 10:03:27 +00:00
Oli Lan
224481ec0e
Merge "Prevent non-admin users from deleting system apps." into tm-dev
2022-03-25 10:00:41 +00:00
Kyunglyul Hyun
0ef7fe46ad
Merge "Set audio route name when LE audio device is connected" am: dd1a3bae15
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2038603
Change-Id: I399d2bb259d50916c575e59621ddfaf798affc5c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-25 09:40:14 +00:00
Christian Göllner
9711658113
Merge "Requery silent notifs lockscreen setting on change" into tm-dev
2022-03-25 09:36:49 +00:00
Nicolò Mazzucato
c1f95fd38b
Merge "Tune fold animation on top of apps" into tm-dev
2022-03-25 09:31:11 +00:00
Kyunglyul Hyun
dd1a3bae15
Merge "Set audio route name when LE audio device is connected"
2022-03-25 09:25:22 +00:00
Christian Göllner
36ad1aee13
Merge "LockscreenShadeTransitionController: add more tests for DepthController interactions" into tm-dev
2022-03-25 09:17:46 +00:00
Philip Junker
1ccb6f2a4c
Merge "Add support for more keycodes to reference remote control." into tm-dev
2022-03-25 09:02:35 +00:00
Cliff Wu
9df4056dcb
Merge "Update toast strings for blocking camera to match UX guideline" into tm-dev
2022-03-25 08:44:26 +00:00
Tiger Huang
29b8170f55
Merge "Fix setSystemBarsAppearances" into sc-v2-dev am: baedc4fdda am: 491d113504
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17378203
Change-Id: Idf7d59382d9cae3161c10655e4533a42ebc5b080
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-25 06:46:23 +00:00
Tiger Huang
491d113504
Merge "Fix setSystemBarsAppearances" into sc-v2-dev am: baedc4fdda
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17378203
Change-Id: I09077452f12c192afc32f5a209d454c6c115ed1b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-25 06:32:14 +00:00
Presubmit Automerger Backend
59ed3fba9a
[automerge] Trusted Hotword: Allow disabling periodic restarts. 2p: fc651fe0d2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17344015
Bug: 224618257
Change-Id: I7c973ce1388a7121f2b62a7dfa89f70f9b72342e
Merged-In: I3b17b47fab4120b42d75443b213be3c1ef5491aa
2022-03-25 06:17:18 +00:00
Tiger Huang
baedc4fdda
Merge "Fix setSystemBarsAppearances" into sc-v2-dev
2022-03-25 06:15:12 +00:00
Joanne Chung
475800990a
Use flag to control the restart period value.
...
Bug: 224618257
Test: adb shell cmd device_config get/put voice_interaction \
restart_period_in_seconds works fine
Test: the value is expected by command: adb shell dumpsys \
voiceinteraction | grep RESTART_PERIOD_SECONDS
Change-Id: Icd8d19c2a482d0d6b9bf0432e2176ca10f3bd2eb
Merged-In: Icd8d19c2a482d0d6b9bf0432e2176ca10f3bd2eb
(cherry picked from commit 46e6944804 )
2022-03-24 23:14:25 -07:00
Ahaan Ugale
fc651fe0d2
Trusted Hotword: Allow disabling periodic restarts.
...
Mitigates quality risk that may arise due to mismanaged state around the
restarts (either on the platform or application side).
The duration will be flag-controlled in a follow-up cl so it can
actually be disabled by flag.
Bug: 224618257
Test: manual
Change-Id: I3b17b47fab4120b42d75443b213be3c1ef5491aa
(cherry picked from commit b8cd0a4286 )
Merged-in: I3b17b47fab4120b42d75443b213be3c1ef5491aa
2022-03-24 22:41:53 -07:00
Winson Chiu
6594433069
Merge "Revert "Revert "Remove all appId migration related public APIs""" into tm-dev
2022-03-25 04:47:26 +00:00
Tiger Huang
491c07a9e0
Check mAttachInfo.mSystemUiVisibility to see if a SysUI flag exists
...
Previously, we checked info.globalVisibility to see if a system UI flag
exists, but since updateCompatSysUiVisibility can process more than one
type of one system bar, info.globalVisibility might be changed by one
type before the other type checks it. For example, if we process
ITYPE_CLIMATE_BAR first with visible=true and hasControl=false, and
then, when we process ITYPE_STATUS_BAR with visible=true and
hasControl=true, we cannot clear SYSTEM_UI_FLAG_FULLSCREEN by setting it
to info.localChanges, because wasVisible is false now.
Fix: 226555579
Bug: 225765490
Test: atest WindowInsetsControllerTests
Change-Id: I820842c7fe14fc47141a4fa09cfddf68f89dbd41
2022-03-25 11:53:29 +08:00
TreeHugger Robot
bb497479ab
Merge "Update the GrantTrustResult to remove static factory method." into tm-dev
2022-03-25 03:52:11 +00:00