Ats Jenk
58143f2030
Merge "If ProtoLog is not required, add fallback to logcat" into udc-qpr-dev
2023-05-30 17:07:56 +00:00
Sally Qi
df271348da
Merge "Fix the issue of using SilkFx crash on non-HDR-supported phone." into udc-dev am: 9cdcda8d45 am: f346da376f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23395745
Change-Id: I9878c803a447faf89b8d780b0c5c49adee994692
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-30 16:48:11 +00:00
Achim Thesmann
fa3ef1d92d
Merge "Opt in SysUI code to allow BAL" into udc-dev am: 863329a87c am: 8e347bb9e5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23445676
Change-Id: I50b1f4935ab8cdc8709595506180cdcba2f7bc88
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-30 16:47:45 +00:00
Sally Qi
f346da376f
Merge "Fix the issue of using SilkFx crash on non-HDR-supported phone." into udc-dev am: 9cdcda8d45
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23395745
Change-Id: Ifbcc4fcfb2dda35cd16c5cbf0b0c537f5c1f1fdf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-30 16:04:23 +00:00
Achim Thesmann
8e347bb9e5
Merge "Opt in SysUI code to allow BAL" into udc-dev am: 863329a87c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23445676
Change-Id: I049e7e194ba9558bcd60cdb6a2b81b04ebd20825
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-30 16:04:00 +00:00
Nataniel Borges
8b441b6333
Merge "Improve app launch test naming" into udc-qpr-dev
2023-05-30 15:57:05 +00:00
Sally Qi
9cdcda8d45
Merge "Fix the issue of using SilkFx crash on non-HDR-supported phone." into udc-dev
2023-05-30 15:37:35 +00:00
Achim Thesmann
863329a87c
Merge "Opt in SysUI code to allow BAL" into udc-dev
2023-05-30 15:25:37 +00:00
Achim Thesmann
c983c6385e
Opt in SysUI code to allow BAL
...
We see some calls from android.uid.systemui being blocked in our logs. Unfortunately we cannot exactly identify the source of these calls, but in a manual review we identified some invocations that may be affected. To avoid activities being blocked and functionality regression, this change will revert those code paths back to T behavior by opting into allowing the launch if the PI sender (systemUI) is in the foreground. Maybe not all these changes are required, but any missed change might cause functionality to break, while extra changes have no functional impact.
The change is relatively safe since it won't block anything, only allow the launch, as it was allowed by default in T.
Bug: 284486752
Test: compile + presubmit
Change-Id: I78f838ba762e7d41d908aff6f003e081ab9b4b7c
2023-05-30 15:24:40 +00:00
Matt Pietal
7fbd2d37e7
Merge "Keyguard - Migrate indication area" into udc-qpr-dev
2023-05-30 15:06:27 +00:00
TreeHugger Robot
a05a2b4c88
[automerger skipped] Merge "Update Pip launches to not enter pinned task if in background." into tm-dev am: 94ec86fed0 am: 38400706fb -s ours am: 12a253e127 -s ours am: eb47f1e425 -s ours am: 5a62ef5d92 -s ours
...
am skip reason: Merged-In Icfe0a17d7f6f127acaae8400a97e8bdc53fcc9ad with SHA-1 291d124257 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23389120
Change-Id: I229b4a8498124ff69bc9bbc28cb741716b997815
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-30 15:00:37 +00:00
Kholoud Mohamed
b278101deb
Merge "Fix bug in policy engine" into udc-dev am: c31805c125 am: a6cce23123
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23470681
Change-Id: I894154a155d774e66771f37f9e1ad0d0a3c367e8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-30 15:00:14 +00:00
TreeHugger Robot
ab74be1866
[automerger skipped] Merge "Update Pip launches to not enter pinned task if in background." into tm-dev am: 94ec86fed0 am: 660ba920bf -s ours am: 3281df43bc -s ours am: ee8156ec94 -s ours
...
am skip reason: Merged-In Icfe0a17d7f6f127acaae8400a97e8bdc53fcc9ad with SHA-1 291d124257 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23389120
Change-Id: I62f1d05534061db950abda4f1929be433be793a7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-30 14:59:27 +00:00
TreeHugger Robot
5a62ef5d92
[automerger skipped] Merge "Update Pip launches to not enter pinned task if in background." into tm-dev am: 94ec86fed0 am: 38400706fb -s ours am: 12a253e127 -s ours am: eb47f1e425 -s ours
...
am skip reason: Merged-In Icfe0a17d7f6f127acaae8400a97e8bdc53fcc9ad with SHA-1 291d124257 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23389120
Change-Id: Ic93aa785d7896a5b71688ee39385d5713544213c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-30 14:15:24 +00:00
Kholoud Mohamed
a6cce23123
Merge "Fix bug in policy engine" into udc-dev am: c31805c125
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23470681
Change-Id: I238370c66e5b12798e0278865c7b59b7814a136c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-30 14:15:10 +00:00
TreeHugger Robot
eb47f1e425
[automerger skipped] Merge "Update Pip launches to not enter pinned task if in background." into tm-dev am: 94ec86fed0 am: 38400706fb -s ours am: 12a253e127 -s ours
...
am skip reason: Merged-In Icfe0a17d7f6f127acaae8400a97e8bdc53fcc9ad with SHA-1 291d124257 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23389120
Change-Id: I51ec0e125781b5ca8c14df6ac50655dc53e4796a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-30 14:13:23 +00:00
TreeHugger Robot
ee8156ec94
[automerger skipped] Merge "Update Pip launches to not enter pinned task if in background." into tm-dev am: 94ec86fed0 am: 660ba920bf -s ours am: 3281df43bc -s ours
...
am skip reason: Merged-In Icfe0a17d7f6f127acaae8400a97e8bdc53fcc9ad with SHA-1 291d124257 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23389120
Change-Id: I763cf925cb55a968b02cbd0875d1f6e03ea19635
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-30 13:53:30 +00:00
Kholoud Mohamed
c31805c125
Merge "Fix bug in policy engine" into udc-dev
2023-05-30 13:47:48 +00:00
Caitlin Shkuratov
1aaaa88ddf
Merge "[Central Surfaces] Remove unused methods & variables from interface." into udc-qpr-dev
2023-05-30 13:42:11 +00:00
TreeHugger Robot
12a253e127
[automerger skipped] Merge "Update Pip launches to not enter pinned task if in background." into tm-dev am: 94ec86fed0 am: 38400706fb -s ours
...
am skip reason: Merged-In Icfe0a17d7f6f127acaae8400a97e8bdc53fcc9ad with SHA-1 291d124257 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23389120
Change-Id: I1ee92d7c144fe459a46e0bacef282d481fb3a1c0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-30 13:32:26 +00:00
TreeHugger Robot
3281df43bc
[automerger skipped] Merge "Update Pip launches to not enter pinned task if in background." into tm-dev am: 94ec86fed0 am: 660ba920bf -s ours
...
am skip reason: Merged-In Icfe0a17d7f6f127acaae8400a97e8bdc53fcc9ad with SHA-1 291d124257 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23389120
Change-Id: I7f0e3c7aa118c1a5c551c97f50706ca1f370920e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-30 13:29:51 +00:00
TreeHugger Robot
38400706fb
Merge "Update Pip launches to not enter pinned task if in background." into tm-dev am: 94ec86fed0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23389120
Change-Id: I3577a3bca11d4a18317e38545a9bfa963ece5259
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-30 12:45:39 +00:00
TreeHugger Robot
660ba920bf
Merge "Update Pip launches to not enter pinned task if in background." into tm-dev am: 94ec86fed0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23389120
Change-Id: I9a8362b426af4eba8365388bf2cb9751c4cf981b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-30 12:45:02 +00:00
Cosmin Băieș
980ec261c6
Merge "Fix race condition in dumpDebug" into udc-qpr-dev
2023-05-30 12:11:32 +00:00
Kriti Dang
cc63ab71d7
Merge "Make brightness per-user in PersistentDataStore" into udc-qpr-dev
2023-05-30 12:00:02 +00:00
TreeHugger Robot
94ec86fed0
Merge "Update Pip launches to not enter pinned task if in background." into tm-dev
2023-05-30 11:52:16 +00:00
Omar Miatello
d96783f670
Merge "Refactor and fix flaky tests in WindowOnBackInvokedDispatcherTest" into udc-dev am: f4f331d65a am: 60982077a1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23352458
Change-Id: I0b3dc86ce70819f0c9cb7b2d1b51f01069eef5ee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-30 11:38:47 +00:00
Oli Lan
8d6da2c634
Merge "Fix low contrast text in add user dialog." into udc-dev am: 59ecd6a40a am: 8caa2ddd63
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23450544
Change-Id: I6b5fac9c02599e478ef25bffef4f4964a71dd84f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-30 11:38:40 +00:00
Treehugger Robot
3978107113
Merge "Keep off displays in trace" into udc-dev am: 145c4ac0f9 am: ac8cedd487
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23448441
Change-Id: I34850928f6a79222af17b5b57947f77b063b0c1b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-30 11:38:31 +00:00
TreeHugger Robot
c6a5bfc031
[automerger skipped] Merge "Update Pip launches to not enter pinned task if in background." into tm-qpr-dev am: 446102d48a -s ours am: 43fb288ec1 -s ours am: 00de5c4a97 -s ours
...
am skip reason: Merged-In Icfe0a17d7f6f127acaae8400a97e8bdc53fcc9ad with SHA-1 7492cc2730 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23412216
Change-Id: I0b92630544aec5626be2bbb4e59c9e1a350283f1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-30 11:38:16 +00:00
Hani Kazmi
6a87059e96
[automerger skipped] Update Pip launches to not enter pinned task if in background. am: 291d124257 -s ours am: 1e378085ab -s ours am: 0ab5807be2 -s ours
...
am skip reason: Merged-In Icfe0a17d7f6f127acaae8400a97e8bdc53fcc9ad with SHA-1 7492cc2730 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23412216
Change-Id: If61daf93003eb192dd64073f6579d6cc9398d9c3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-30 11:38:13 +00:00
TreeHugger Robot
61a5bf975d
Merge "[Panlingual] Remove the scrollbar in caregory textview" into udc-dev am: 21f890ccd3 am: 633be2f7b5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23444858
Change-Id: I6d11f1649ab8d02f9e33fe4d474c620ae8673778
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-30 11:38:02 +00:00
Treehugger Robot
0ad91d24ed
Merge "Fix cancel button on screen recording dialog when PSS enabled" into udc-dev am: c2f1f42103 am: 22d850d6a0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23451076
Change-Id: If78546132323230dbd73a3b85afbdada07475655
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-30 11:37:45 +00:00
Omar Miatello
60982077a1
Merge "Refactor and fix flaky tests in WindowOnBackInvokedDispatcherTest" into udc-dev am: f4f331d65a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23352458
Change-Id: I3c75ef2a4d56cee1310f1c0e53af90503301308c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-30 11:37:44 +00:00
Elis Elliott
3b07923b82
Merge "Only call canUserCallLockTask when the caller is a DPC" into udc-dev am: 6daf38c0e5 am: e8f897e0b2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23434561
Change-Id: I65f41a05106a5677a3cb6d683ee6fb69c54a7451
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-30 11:37:31 +00:00
Omar Miatello
f4f331d65a
Merge "Refactor and fix flaky tests in WindowOnBackInvokedDispatcherTest" into udc-dev
2023-05-30 11:23:21 +00:00
Oli Lan
8caa2ddd63
Merge "Fix low contrast text in add user dialog." into udc-dev am: 59ecd6a40a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23450544
Change-Id: I5ca19d41f39d753796ed3e929550cd7db51a1a05
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-30 11:14:51 +00:00
Treehugger Robot
ac8cedd487
Merge "Keep off displays in trace" into udc-dev am: 145c4ac0f9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23448441
Change-Id: I82f6fadb62af6be0f1ef2b421cf3e3e46717fdf7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-30 11:14:03 +00:00
Oli Lan
59ecd6a40a
Merge "Fix low contrast text in add user dialog." into udc-dev
2023-05-30 11:11:41 +00:00
Treehugger Robot
145c4ac0f9
Merge "Keep off displays in trace" into udc-dev
2023-05-30 11:05:56 +00:00
TreeHugger Robot
00de5c4a97
[automerger skipped] Merge "Update Pip launches to not enter pinned task if in background." into tm-qpr-dev am: 446102d48a -s ours am: 43fb288ec1 -s ours
...
am skip reason: Merged-In Icfe0a17d7f6f127acaae8400a97e8bdc53fcc9ad with SHA-1 7492cc2730 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23412216
Change-Id: I4d110af773d70f7a890f807d265e22e59d55a809
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-30 10:53:45 +00:00
Hani Kazmi
0ab5807be2
[automerger skipped] Update Pip launches to not enter pinned task if in background. am: 291d124257 -s ours am: 1e378085ab -s ours
...
am skip reason: Merged-In Icfe0a17d7f6f127acaae8400a97e8bdc53fcc9ad with SHA-1 7492cc2730 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23412216
Change-Id: I043d3ee2236b3da2296f0cb2ca70624b7a6daad4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-30 10:53:42 +00:00
TreeHugger Robot
633be2f7b5
Merge "[Panlingual] Remove the scrollbar in caregory textview" into udc-dev am: 21f890ccd3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23444858
Change-Id: Ib661443fc6e4be89a78fb2ecfea56c242c8c7292
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-30 10:53:33 +00:00
Treehugger Robot
22d850d6a0
Merge "Fix cancel button on screen recording dialog when PSS enabled" into udc-dev am: c2f1f42103
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23451076
Change-Id: I784841528b0a7f82ab6a5721483b4134aa812e71
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-30 10:53:01 +00:00
Elis Elliott
e8f897e0b2
Merge "Only call canUserCallLockTask when the caller is a DPC" into udc-dev am: 6daf38c0e5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23434561
Change-Id: I8e4079791b07592cfec0ffc0eb9d02aa6370993c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-30 10:52:32 +00:00
TreeHugger Robot
43fb288ec1
[automerger skipped] Merge "Update Pip launches to not enter pinned task if in background." into tm-qpr-dev am: 446102d48a -s ours
...
am skip reason: Merged-In Icfe0a17d7f6f127acaae8400a97e8bdc53fcc9ad with SHA-1 7492cc2730 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23412216
Change-Id: I735737c5f80d81b57ffc3523ea2b881e22d92cd6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-30 10:27:10 +00:00
Hani Kazmi
1e378085ab
[automerger skipped] Update Pip launches to not enter pinned task if in background. am: 291d124257 -s ours
...
am skip reason: Merged-In Icfe0a17d7f6f127acaae8400a97e8bdc53fcc9ad with SHA-1 7492cc2730 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23412216
Change-Id: If9a04ad43649fb04e91a6fb0079d94b8264d5b15
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-30 10:26:58 +00:00
TreeHugger Robot
21f890ccd3
Merge "[Panlingual] Remove the scrollbar in caregory textview" into udc-dev
2023-05-30 10:15:18 +00:00
Kholoud Mohamed
0ec0709b7e
Fix bug in policy engine
...
Fixes: 284310582
Test: btest android.devicepolicy.cts.DeviceManagementCoexistenceTest#multiplePoliciesSet_dpcRemoved_removesPolicies
Change-Id: Ifeba7225d41acfc3223706c23a0fd302af670f05
2023-05-30 09:58:13 +00:00
Treehugger Robot
c2f1f42103
Merge "Fix cancel button on screen recording dialog when PSS enabled" into udc-dev
2023-05-30 09:55:12 +00:00