Jonathan Scott
ae1653b95e
Fix minor issues.
...
Test: btest CtsDevicePolicyTestCases
Bug: 280269495
Change-Id: I0f78cb714253091e54951a3928d546adb86d2954
2023-05-09 11:09:36 +00:00
Ioana Alexandru
82fb81741a
Merge "Verify URI permissions for notification shortcutIcon." into sc-dev am: 10ce511ed9 am: 2f2f8155b2 am: d07bdb1979
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22894946
Change-Id: I9c8f36bbab76a3d93901d5fd16b223d02c5db60d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-09 11:06:43 +00:00
Automerger Merge Worker
f768af713a
Merge "Merge "bt: Use group id to select color for icon" into udc-dev am: b98f79e575" into udc-mainline-prod
2023-05-09 10:57:17 +00:00
Automerger Merge Worker
e393e01eef
Merge "Merge changes from topic "presubmit-am-b58a01f1adec4c46ae37d132031c6dc4" into sc-qpr1-dev am: 7588315470 am: 3151caeedd am: a4cd210406 am: f7f0bf5485" into tm-qpr-dev
2023-05-09 10:56:36 +00:00
Michał Narajowski
e243a78e9e
Merge "bt: Use group id to select color for icon" into udc-dev am: b98f79e575
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23083998
Change-Id: I2b954411ef565a08ba43c9f458372560cc8c3811
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-09 10:56:05 +00:00
Automerger Merge Worker
c30822005b
Merge "Merge "bt: Use group id to select color for icon" into udc-dev am: b98f79e575" into udc-mainline-prod
2023-05-09 10:55:28 +00:00
Michał Narajowski
bb4100f838
Merge "bt: Use group id to select color for icon" into udc-dev am: b98f79e575
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23083998
Change-Id: I9720aea1abad4d6a77cbfc7a60d320662bde8062
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-09 10:55:21 +00:00
Ioana Alexandru
1099fb0d7f
Merge changes from topic "presubmit-am-b58a01f1adec4c46ae37d132031c6dc4" into sc-qpr1-dev am: 7588315470 am: 3151caeedd am: a4cd210406 am: f7f0bf5485
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22894946
Change-Id: Ia96f630b1fa970e570ca8fb307bdef1d43df132f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-09 10:53:55 +00:00
Automerger Merge Worker
6a99c6e251
Merge "Merge changes from topic "presubmit-am-b58a01f1adec4c46ae37d132031c6dc4" into sc-qpr1-dev am: 7588315470 am: 3151caeedd am: a4cd210406 am: f7f0bf5485" into tm-qpr-dev
2023-05-09 10:53:16 +00:00
Michał Narajowski
afd522c460
Merge "bt: Use group id to select color for icon" into udc-dev am: b98f79e575
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23083998
Change-Id: Iac5ab45c989292681bcc22c4dc8d15b85cc0c033
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-09 10:52:50 +00:00
Ioana Alexandru
1e4f72a98d
[automerger skipped] Merge "Verify URI permissions for notification shortcutIcon." into tm-qpr-dev am: 007f91eb6c -s ours am: 2159c058c4 -s ours
...
am skip reason: skipped by user aioana
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23083138
Change-Id: Idd76b1d16033fc413d7cccd8d97169e888ddfb6a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-09 10:52:08 +00:00
Ioana Alexandru
e22231af9f
Merge changes from topic "presubmit-am-b58a01f1adec4c46ae37d132031c6dc4" into sc-qpr1-dev am: 7588315470 am: 3151caeedd am: a4cd210406 am: f7f0bf5485
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22894946
Change-Id: I0db663a76d945da3248d0648e23d2a6f9d055737
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-09 10:52:02 +00:00
Elis Elliott
3b654ec0da
Merge "Remove references to permissions in docs of flagged APIs" into udc-dev am: d96b5ba831
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23029449
Change-Id: I5fa804f0c70a75c71f10f414e6244911cdf2f64a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-09 10:51:32 +00:00
Treehugger Robot
05da757a7f
Merge "Add toString to ST recog event types" into udc-dev
2023-05-09 10:51:17 +00:00
Ioana Alexandru
5d3c4c5a7a
Merge changes from topic "presubmit-am-b58a01f1adec4c46ae37d132031c6dc4" into sc-qpr1-dev am: 7588315470 am: 3151caeedd am: a4cd210406 am: f7f0bf5485
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22894946
Change-Id: I8c7d4d1b97c4fd8c38aabfef38bba9a690b1baff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-09 10:51:11 +00:00
Ioana Alexandru
44d87b12a0
Merge "Verify URI permissions for notification shortcutIcon." into sc-qpr1-dev am: 2a8bb5568a am: 46854f586b am: 3ff17ae251 am: 48e6a92906
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23083217
Change-Id: Ib5589944b6654ecdc9dba6c25b27827dc792ff1b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-09 10:50:53 +00:00
Ioana Alexandru
5b211c0689
Merge "Verify URI permissions for notification shortcutIcon." into udc-dev am: fbbf6f759f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22926916
Change-Id: Id3e38b49098d6356a07eae25a9f508045bb08473
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-09 10:50:50 +00:00
Nicolas Sleiman
055a75da87
Merge "Override work profile OEM telephony shortcuts with defaults" into udc-dev am: 0b2cda7782
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22990097
Change-Id: I2cc01ac8f8ac80dbb6e17b841760fa1c396ad4de
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-09 10:50:15 +00:00
Ján Sebechlebský
8754a10579
Merge "Support virtual device specific audio session in TTS." into udc-dev am: 0b263f790c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22463391
Change-Id: I5e61ce643c8ec9d8df734ce548987e811ede5600
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-09 10:49:18 +00:00
Joanne Chung
5fc1404750
Merge "InstallConstraints API javadoc improvement" into udc-dev am: 029ca32ffa
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23050247
Change-Id: I56755d4e92aa6c6941f48b380c47b0fe72f98175
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-09 10:46:29 +00:00
Treehugger Robot
c4f071fc7a
Merge "Fix unexpected starting window removal timeout when in fixed-rotation" into udc-dev am: 228c3d300f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23087237
Change-Id: I88a21186c0a321e01fc9e5a1cd3cbfadf66c7836
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-09 10:45:45 +00:00
Shaowei Shen
a4dedc9fe1
Merge "[Output switcher] Change to use selected routes" into udc-dev am: d1575fb232
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23011724
Change-Id: I227fe8a92c89da66b44760749fed6caf16699205
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-09 10:45:06 +00:00
Automerger Merge Worker
827c068ee3
Merge "Merge "Disable emoji compat initializer" into udc-dev am: 29b802e880" into udc-mainline-prod
2023-05-09 10:44:45 +00:00
Winson Chung
7886ab2fa0
Merge "Disable emoji compat initializer" into udc-dev am: 29b802e880
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22994546
Change-Id: I6823815cc8dae142b5f74c2caabc50a52ec50483
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-09 10:44:35 +00:00
Winson Chung
bd63bda86d
Merge "Disable emoji compat initializer" into udc-dev am: 29b802e880
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22994546
Change-Id: I930c4adc9c7a3d27c2e666c48844192f30a7260b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-09 10:44:25 +00:00
Treehugger Robot
2b4211b6ad
Merge "Do not redraw if no change on reparent" into udc-dev am: d53107bdd3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23083577
Change-Id: Ifd9185abcfb3db1f33675a979d77da2b5d4b651c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-09 10:43:46 +00:00
Joanne Chung
83c9e6e058
Merge "Validate checkInstallConstraints() installer package name" into udc-dev am: d359469b9b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23053819
Change-Id: I215dd38cedcdd5d93e679ebd14162fe3066a8f2b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-09 10:43:16 +00:00
Bryce Lee
0e4621c406
Merge "Revert "Add elevation to dream home controls button."" into udc-dev am: 37b8ca636b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23089776
Change-Id: I8d56317f10bb941dcba06b2c0a63ec53f16c0a8d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-09 10:42:14 +00:00
TreeHugger Robot
174c28b7e8
Merge "Check dump permission in STService" into udc-dev
2023-05-09 10:42:05 +00:00
Treehugger Robot
9eb1133980
Merge "Return right activities in getTopVisibleActivities method" into udc-dev am: d401d88fe1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22954347
Change-Id: I8eb1f2ed1cc67cb596d73333c4982672fa4dede4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-09 10:41:25 +00:00
Faye Yan
704f725a6b
Merge "Revert denying USE_FULL_SCREEN_INTENT unless allowlisted in U Beta3." into udc-dev am: 07dbf8e88a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22994598
Change-Id: I22d02a9dfbc8d248d20b657d8d010a5c2159c594
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-09 10:40:15 +00:00
Automerger Merge Worker
5cca68405b
Merge "Merge "Log the process hosting component types in ProcessMemorySnapshot" into udc-dev am: a571b3d557" into udc-mainline-prod
2023-05-09 10:39:37 +00:00
Jing Ji
b7adfc7642
Merge "Log the process hosting component types in ProcessMemorySnapshot" into udc-dev am: a571b3d557
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23075450
Change-Id: If52b2877e29148a31ce9e9088395fec2d94dfec5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-09 10:39:27 +00:00
Jing Ji
0254510273
Merge "Log the process hosting component types in ProcessMemorySnapshot" into udc-dev am: a571b3d557
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23075450
Change-Id: Idacc33b01e9cc597f046104b1f00807279229a14
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-09 10:38:46 +00:00
TYM Tsai
a89ffbeca8
Update Autofill OWNERS
...
Change-Id: I2ede618281898201d41f15838465970f21f0270d
Merged-In: If9b602a12b372b20f398583aba06f29ea7aa6e5e
2023-05-09 10:38:31 +00:00
Andreas Miko
159238f2b3
Add tap to wake light reveal with tap position awareness
...
tablet for now does not register this sensor on AOC and will need a FW update to support this. The code will default back to LiftReveal for devices that do not report a tap location.
Bug: b/271267950
Test: Added unit test and manually tested on pixel 6a and tablet
Change-Id: I0dc68be926ae1df54beedda5fb1eabd426358fad
2023-05-09 12:38:07 +02:00
Automerger Merge Worker
d8e6fcf68d
Merge "Merge "Limit namespace length." into udc-dev am: 6db854c14e" into udc-mainline-prod
2023-05-09 10:36:58 +00:00
TreeHugger Robot
b8f845ac99
Merge "Limit namespace length." into udc-dev am: 6db854c14e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23089180
Change-Id: Ie5e625ac54ea9b6d607e1daee97d66b9ee8c5f81
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-09 10:36:52 +00:00
TreeHugger Robot
183b9acc59
Merge "Limit namespace length." into udc-dev am: 6db854c14e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23089180
Change-Id: I430a1e55e9a288a90f3d4f501ee1033a63ae9f8d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-09 10:36:50 +00:00
Silin Huang
3749e79f71
Merge "Do not load drawable for wallet card if the card image icon iscreated with content URI." into sc-dev am: eda58607c8 am: cb2ad18704 am: 53f1f4613d am: c3ef945b91 am: bc6f937d9f am: 38080c8df1 am: bba308b27e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22599577
Change-Id: I3d1b0d44d0446f4e9716becca0f5a81cf30ba30a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-09 10:36:27 +00:00
Silin Huang
3157cd4edc
Merge changes from topic "presubmit-am-361ce2f2beb3432cae0398341bab71ca" into sc-qpr1-dev am: 324903d93f am: c297a9eff8 am: e1e0ae15a9 am: 5ca32eaad0 am: 7a9f5ba021 am: fd1c743ad4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22599577
Change-Id: Ib77535e0541d4048e400900f7f382c5ab07926d9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-09 10:35:58 +00:00
Raphael Kim
4a037f5365
Merge "[CDM] remove platform version exchange protocol" into udc-dev am: c111807c2b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23048343
Change-Id: I2d4f6d08b1ceb1fa766a0f42b61f7fd6d6022e79
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-09 10:35:42 +00:00
Automerger Merge Worker
dcc71720dd
Merge "Merge "Do not load drawable for wallet card if the card image icon iscreated with content URI." into sc-dev am: eda58607c8 am: cb2ad18704 am: 53f1f4613d am: c3ef945b91 am: 017c1265ac am: d9e3a829b7" into udc-mainline-prod
2023-05-09 10:34:48 +00:00
Silin Huang
cd91c7d770
Merge "Do not load drawable for wallet card if the card image icon iscreated with content URI." into sc-dev am: eda58607c8 am: cb2ad18704 am: 53f1f4613d am: c3ef945b91 am: 017c1265ac am: d9e3a829b7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22599577
Change-Id: I7bfd7a74ab8376cf218a16385aa480455faa75dc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-09 10:34:40 +00:00
Silin Huang
ca50b1ea00
Merge "Do not load drawable for wallet card if the card image icon iscreated with content URI." into sc-dev am: eda58607c8 am: cb2ad18704 am: 53f1f4613d am: c3ef945b91 am: 017c1265ac am: d9e3a829b7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22599577
Change-Id: I1ff1c41be5bb2319a1f0d2b5ce4b60bc7434f42c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-09 10:34:36 +00:00
Silin Huang
e3b397afa6
Merge changes from topic "presubmit-am-361ce2f2beb3432cae0398341bab71ca" into sc-qpr1-dev am: 324903d93f am: c297a9eff8 am: e1e0ae15a9 am: 5e2f647453 am: 20aa07fbdf
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22599577
Change-Id: Ic894f084cb39d5ac4a768e85443a14117d0ba724
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-09 10:34:20 +00:00
TreeHugger Robot
cffc0b88ed
Merge "Bug fix for back arrow behavior." into udc-dev am: 8061467c89
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23091100
Change-Id: Ib9b853b529fd89aa7265c20da87c27d2fbc25cd2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-09 10:34:06 +00:00
Treehugger Robot
57a357c636
Merge "Support CMF default wallpaper" into udc-dev am: 275eeea950
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23004845
Change-Id: Id590e28c264a301dab57563677481cb1121b7436
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-09 10:33:26 +00:00
TreeHugger Robot
c0e94f52f1
Merge "Enable use_embedded_native_libs for CtsShimPrivUpgrade" into udc-dev am: 12aac90c36
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23092776
Change-Id: I0ef0d2af3bb102e3421f4bc068c976dd12dbca0e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-09 10:31:18 +00:00
Ioana Alexandru
f7f0bf5485
Merge changes from topic "presubmit-am-b58a01f1adec4c46ae37d132031c6dc4" into sc-qpr1-dev am: 7588315470 am: 3151caeedd am: a4cd210406
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22894946
Change-Id: Ib1e91d202b0621aef615b27fec3a00d0e9d85f69
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-09 10:31:13 +00:00