Commit Graph

106727 Commits

Author SHA1 Message Date
Hao Dong
559fb5441d [automerger skipped] Merge "Set class name when createConfirmDeviceCredentialIntent() API is used." into sc-dev am: bc358528fe -s ours
am skip reason: Merged-In I762f280def79d428ed9cf119ace5ccc2b6be2560 with SHA-1 c70e6bf477 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/28784981

Change-Id: Ie14dd66bdafd6afa7e31657915b9667b5325713a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2025-01-09 12:24:44 -08:00
Hao Dong
3acc39816b [automerger skipped] Set class name when createConfirmDeviceCredentialIntent() API is used. am: 931b100159 -s ours
am skip reason: Merged-In I762f280def79d428ed9cf119ace5ccc2b6be2560 with SHA-1 c70e6bf477 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/28784981

Change-Id: I01d93555887586edf46a97488c2b1126bf41b8a2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2025-01-09 12:24:33 -08:00
Hao Dong
6f3bb938f7 [automerger skipped] Merge "Set class name when createConfirmDeviceCredentialIntent() API is used." into sc-qpr1-dev am: aad0b6827b -s ours am: dc418ca7bf -s ours
am skip reason: Merged-In I762f280def79d428ed9cf119ace5ccc2b6be2560 with SHA-1 417970a8ca is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/29913410

Change-Id: I5fb4dc47e9ea8f38117d2b510f5d6af35a9cf2ff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2025-01-09 12:24:23 -08:00
Hao Dong
97e41c368d [automerger skipped] Set class name when createConfirmDeviceCredentialIntent() API is used. am: c70e6bf477 -s ours am: 717ffa9a1b -s ours
am skip reason: Merged-In I762f280def79d428ed9cf119ace5ccc2b6be2560 with SHA-1 417970a8ca is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/29913410

Change-Id: Ief4cb39beb56bf1e156fff82d2ce3a5cee6044ce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2025-01-09 12:24:17 -08:00
Hao Dong
bc358528fe Merge "Set class name when createConfirmDeviceCredentialIntent() API is used." into sc-dev 2025-01-09 11:55:41 -08:00
Hao Dong
dc418ca7bf [automerger skipped] Merge "Set class name when createConfirmDeviceCredentialIntent() API is used." into sc-qpr1-dev am: aad0b6827b -s ours
am skip reason: Merged-In I762f280def79d428ed9cf119ace5ccc2b6be2560 with SHA-1 417970a8ca is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/29913410

Change-Id: I37c51756eb2c8edd9ab4bac58210ada15acf502f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2025-01-09 11:10:42 -08:00
Hao Dong
717ffa9a1b [automerger skipped] Set class name when createConfirmDeviceCredentialIntent() API is used. am: c70e6bf477 -s ours
am skip reason: Merged-In I762f280def79d428ed9cf119ace5ccc2b6be2560 with SHA-1 417970a8ca is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/29913410

Change-Id: Ia08a93b5cc97925c3411caa8bc362511d26f2fe9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2025-01-09 11:10:39 -08:00
Hao Dong
aad0b6827b Merge "Set class name when createConfirmDeviceCredentialIntent() API is used." into sc-qpr1-dev 2025-01-09 10:37:25 -08:00
Hao Dong
901e7377cc [automerger skipped] Merge "Set class name when createConfirmDeviceCredentialIntent() API is used." into sc-v2-dev am: a0b42f7f95 -s ours am: 66f8db84d6 -s ours
am skip reason: Merged-In I762f280def79d428ed9cf119ace5ccc2b6be2560 with SHA-1 2b7c1f1105 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/29911394

Change-Id: Id78bea040278ce2387b6ad844e112a37a2412424
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2025-01-09 09:55:50 -08:00
Hao Dong
9cce9a26c7 [automerger skipped] Set class name when createConfirmDeviceCredentialIntent() API is used. am: 417970a8ca -s ours am: 19c298d5a9 -s ours
am skip reason: Merged-In I762f280def79d428ed9cf119ace5ccc2b6be2560 with SHA-1 2b7c1f1105 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/29911394

Change-Id: I9cacdae71cb8cc67977e9e9ace2350cd4bb0ad93
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2025-01-09 09:55:44 -08:00
Hao Dong
66f8db84d6 [automerger skipped] Merge "Set class name when createConfirmDeviceCredentialIntent() API is used." into sc-v2-dev am: a0b42f7f95 -s ours
am skip reason: Merged-In I762f280def79d428ed9cf119ace5ccc2b6be2560 with SHA-1 2b7c1f1105 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/29911394

Change-Id: I6379e2bc68a751a031c4c1f5ae821553096fecba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2025-01-09 09:35:56 -08:00
Hao Dong
19c298d5a9 [automerger skipped] Set class name when createConfirmDeviceCredentialIntent() API is used. am: 417970a8ca -s ours
am skip reason: Merged-In I762f280def79d428ed9cf119ace5ccc2b6be2560 with SHA-1 2b7c1f1105 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/29911394

Change-Id: Icdb092214251cff340514e664c57c23046e3c093
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2025-01-09 09:35:50 -08:00
Hao Dong
a0b42f7f95 Merge "Set class name when createConfirmDeviceCredentialIntent() API is used." into sc-v2-dev 2025-01-09 09:03:17 -08:00
Hao Dong
417970a8ca Set class name when createConfirmDeviceCredentialIntent() API is used.
Flag: EXEMPT bugfix
Bug: 339532378
Test: manual test
Change-Id: I762f280def79d428ed9cf119ace5ccc2b6be2560
Merged-In: I762f280def79d428ed9cf119ace5ccc2b6be2560
2025-01-08 23:08:00 -08:00
Hao Dong
2688ddf907 Merge "Set class name when createConfirmDeviceCredentialIntent() API is used." into tm-dev am: 5b67d6e863
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/28784982

Change-Id: Iefd9e1dd0a1558ab9b1c6af88f8905804b6cdb62
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2025-01-08 21:58:09 -08:00
Hao Dong
5b67d6e863 Merge "Set class name when createConfirmDeviceCredentialIntent() API is used." into tm-dev 2025-01-08 21:34:50 -08:00
Hao Dong
ccd03aaeb9 Merge "Set class name when createConfirmDeviceCredentialIntent() API is used." into tm-qpr-dev 2025-01-08 19:43:18 -08:00
Fan Wu
87645011fc Check the permission of the callingUid instead of the calling package
Bug: 372671447
Test: atest
Flag: EXEMPT bug fix
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:e719575e92c1e6bd0b9088663e6c909bccf2b007)
Merged-In: Ib36c0a3ba482bcddd53c2c09409ea818e6f43cad
Change-Id: Ib36c0a3ba482bcddd53c2c09409ea818e6f43cad
2025-01-08 18:57:33 -08:00
Fan Wu
353cfc1b08 Check the permission of the callingUid instead of the calling package
Bug: 372671447
Test: atest
Flag: EXEMPT bug fix
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:e719575e92c1e6bd0b9088663e6c909bccf2b007)
Merged-In: Ib36c0a3ba482bcddd53c2c09409ea818e6f43cad
Change-Id: Ib36c0a3ba482bcddd53c2c09409ea818e6f43cad
2025-01-08 18:56:32 -08:00
Mill Chen
b1e4cd09ff Add default Sound Picker package name
To avoid implicit intents, make intents launch explicitly.


Bug: 333344157
Test: Build
Change-Id: I905c0f3ddaf0f488ff2fc3bf1747b6df0d802504
Merged-In: I905c0f3ddaf0f488ff2fc3bf1747b6df0d802504
2024-12-26 23:02:14 -08:00
Mill Chen
cf52112bcb Add default Sound Picker package name
To avoid implicit intents, make intents launch explicitly.


Bug: 333344157
Test: Build
Change-Id: I905c0f3ddaf0f488ff2fc3bf1747b6df0d802504
Merged-In: I905c0f3ddaf0f488ff2fc3bf1747b6df0d802504
2024-12-26 23:02:01 -08:00
Mill Chen
94681e3436 Add default Sound Picker package name
To avoid implicit intents, make intents launch explicitly.


Bug: 333344157
Test: Build
Change-Id: I905c0f3ddaf0f488ff2fc3bf1747b6df0d802504
Merged-In: I905c0f3ddaf0f488ff2fc3bf1747b6df0d802504
2024-12-26 23:01:48 -08:00
Mill Chen
be15ba86a7 Add default Sound Picker package name
To avoid implicit intents, make intents launch explicitly.


Bug: 333344157
Test: Build
Change-Id: I905c0f3ddaf0f488ff2fc3bf1747b6df0d802504
Merged-In: I905c0f3ddaf0f488ff2fc3bf1747b6df0d802504
2024-12-26 23:01:26 -08:00
Mill Chen
89a32bb7d2 Add default Sound Picker package name
To avoid implicit intents, make intents launch explicitly.


Bug: 333344157
Test: Build
Change-Id: I905c0f3ddaf0f488ff2fc3bf1747b6df0d802504
Merged-In: I905c0f3ddaf0f488ff2fc3bf1747b6df0d802504
2024-12-26 23:01:07 -08:00
Treehugger Robot
e37a2247f1 [automerger skipped] Merge "Don't let profiles open the UserSettings overflow [DO NOT MERGE]" into sc-v2-dev am: b937941549 -s ours am: cfaac63123 -s ours am: 6f5e87739b -s ours
am skip reason: contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/30490209

Change-Id: I0a59109fe30ca1f6661d70f4a6ca70dba48a8356
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-12-03 21:39:12 +00:00
Adam Bookatz
055a2bca93 [automerger skipped] Don't let profiles open the UserSettings overflow [DO NOT MERGE] am: 4901c86b76 -s ours am: 20bee2e84b -s ours am: dad028a675 -s ours
am skip reason: contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/30490209

Change-Id: Ided81a48685038c891f0bb5c5dab861b82e21d3d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-12-03 21:39:09 +00:00
Treehugger Robot
8ab0f1de3c [automerger skipped] Merge "Don't let profiles open the UserSettings overflow [DO NOT MERGE]" into sc-dev am: ead69f3d43 -s ours am: ad1e470fc0 -s ours am: 2112cc5ef9 -s ours am: 3764a4cb26 -s ours am: 559b96d9b6 -s ours
am skip reason: contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/30487387

Change-Id: I8bf49b9f204c94ac2ba0ab278fac07a71b1f5ea7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-12-03 21:38:59 +00:00
Adam Bookatz
37173a8dfb [automerger skipped] Don't let profiles open the UserSettings overflow [DO NOT MERGE] am: 44a35ac07b -s ours am: 9d81e7d2e5 -s ours am: d5e5daf68e -s ours am: 80f4a4d681 -s ours am: aa291510b8 -s ours
am skip reason: contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/30487387

Change-Id: I1c6975f94aff1564b724c0ea3432d93c3738f749
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-12-03 21:38:56 +00:00
Treehugger Robot
2060250a81 [automerger skipped] Merge "Don't let profiles open the UserSettings overflow [DO NOT MERGE]" into sc-qpr1-dev am: 8cfbd8aa9b -s ours am: 24dc9f533a -s ours am: 329fd334c3 -s ours am: cf4b80e413 -s ours
am skip reason: contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/30490208

Change-Id: I41cf5d8c067a2d5a8c8836f918655bbc07283a91
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-12-03 21:38:42 +00:00
Adam Bookatz
1db07ae91a [automerger skipped] Don't let profiles open the UserSettings overflow [DO NOT MERGE] am: 6f1c499e57 -s ours am: 1a45fcee73 -s ours am: 1596e41a75 -s ours am: bb96e81f34 -s ours
am skip reason: contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/30490208

Change-Id: I39d8d20ae253df0e784505aaf4770ae972e2ecc1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-12-03 21:38:38 +00:00
Treehugger Robot
6f5e87739b [automerger skipped] Merge "Don't let profiles open the UserSettings overflow [DO NOT MERGE]" into sc-v2-dev am: b937941549 -s ours am: cfaac63123 -s ours
am skip reason: contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/30490209

Change-Id: I94ccc0fa0988d9057bbf38f1036ed9feb46793ad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-12-03 21:05:00 +00:00
Adam Bookatz
dad028a675 [automerger skipped] Don't let profiles open the UserSettings overflow [DO NOT MERGE] am: 4901c86b76 -s ours am: 20bee2e84b -s ours
am skip reason: contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/30490209

Change-Id: Ia2bd2efe7dfeb5337bc793a6131459fd82f3b75c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-12-03 21:04:56 +00:00
Treehugger Robot
559b96d9b6 [automerger skipped] Merge "Don't let profiles open the UserSettings overflow [DO NOT MERGE]" into sc-dev am: ead69f3d43 -s ours am: ad1e470fc0 -s ours am: 2112cc5ef9 -s ours am: 3764a4cb26 -s ours
am skip reason: contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/30487387

Change-Id: I92822daea33e4b2ef0b056a34bacf9f04b8509a6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-12-03 21:04:46 +00:00
Adam Bookatz
aa291510b8 [automerger skipped] Don't let profiles open the UserSettings overflow [DO NOT MERGE] am: 44a35ac07b -s ours am: 9d81e7d2e5 -s ours am: d5e5daf68e -s ours am: 80f4a4d681 -s ours
am skip reason: contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/30487387

Change-Id: I3abd990815f144cf0987ee05780ca22c5de0eb6c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-12-03 21:04:42 +00:00
Treehugger Robot
cf4b80e413 [automerger skipped] Merge "Don't let profiles open the UserSettings overflow [DO NOT MERGE]" into sc-qpr1-dev am: 8cfbd8aa9b -s ours am: 24dc9f533a -s ours am: 329fd334c3 -s ours
am skip reason: contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/30490208

Change-Id: Ib16b9d1da6301ef7433d03c5f3a3ee6f22a020df
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-12-03 21:04:33 +00:00
Adam Bookatz
bb96e81f34 [automerger skipped] Don't let profiles open the UserSettings overflow [DO NOT MERGE] am: 6f1c499e57 -s ours am: 1a45fcee73 -s ours am: 1596e41a75 -s ours
am skip reason: contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/30490208

Change-Id: Icca922d438389bf62ea48dfcc8195c8be63a5765
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-12-03 21:04:30 +00:00
Treehugger Robot
cfaac63123 [automerger skipped] Merge "Don't let profiles open the UserSettings overflow [DO NOT MERGE]" into sc-v2-dev am: b937941549 -s ours
am skip reason: contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/30490209

Change-Id: I2cf72fe9d591a6944472a201a95a8e6767916b45
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-12-03 20:39:09 +00:00
Adam Bookatz
20bee2e84b [automerger skipped] Don't let profiles open the UserSettings overflow [DO NOT MERGE] am: 4901c86b76 -s ours
am skip reason: contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/30490209

Change-Id: I951c78b82f0f8ffa45ca75f0f50f1bb7b45b672c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-12-03 20:39:04 +00:00
Treehugger Robot
3764a4cb26 [automerger skipped] Merge "Don't let profiles open the UserSettings overflow [DO NOT MERGE]" into sc-dev am: ead69f3d43 -s ours am: ad1e470fc0 -s ours am: 2112cc5ef9 -s ours
am skip reason: contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/30487387

Change-Id: I4f9affde15cd4ed99d18ca92661dc6269f3c5285
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-12-03 20:38:53 +00:00
Adam Bookatz
80f4a4d681 [automerger skipped] Don't let profiles open the UserSettings overflow [DO NOT MERGE] am: 44a35ac07b -s ours am: 9d81e7d2e5 -s ours am: d5e5daf68e -s ours
am skip reason: contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/30487387

Change-Id: Ie26bb795e1b0a2ae6e8e8e7a2d7a2db4245b9e8f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-12-03 20:38:47 +00:00
Treehugger Robot
329fd334c3 [automerger skipped] Merge "Don't let profiles open the UserSettings overflow [DO NOT MERGE]" into sc-qpr1-dev am: 8cfbd8aa9b -s ours am: 24dc9f533a -s ours
am skip reason: contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/30490208

Change-Id: Id24190cf6ed3742f08b7ec721565d397eb11985b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-12-03 20:38:36 +00:00
Adam Bookatz
1596e41a75 [automerger skipped] Don't let profiles open the UserSettings overflow [DO NOT MERGE] am: 6f1c499e57 -s ours am: 1a45fcee73 -s ours
am skip reason: contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/30490208

Change-Id: I5f08938878d15cd7643146bd5879b65716c3b817
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-12-03 20:38:29 +00:00
Treehugger Robot
157d188e4f [automerger skipped] Merge "Don't let profiles open the UserSettings overflow [DO NOT MERGE]" into tm-dev am: e0e72a57b7 am: 2b8075716b -s ours
am skip reason: Merged-In I5e4c095cda3e19fa5c63c2c550a526f5da8ec5c1 with SHA-1 9882f43d9c is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/30490211

Change-Id: I66801867f8f150d4b06e78ad7d2c95fe2184f9cf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-12-03 20:37:51 +00:00
Adam Bookatz
aa78945af2 [automerger skipped] Don't let profiles open the UserSettings overflow [DO NOT MERGE] am: 31e69deb28 am: 88f8eaecd6 -s ours
am skip reason: Merged-In I5e4c095cda3e19fa5c63c2c550a526f5da8ec5c1 with SHA-1 9882f43d9c is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/30490211

Change-Id: Ic4da3cf7abf3928136a9d365179dd216b02fb61a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-12-03 20:37:47 +00:00
Treehugger Robot
b937941549 Merge "Don't let profiles open the UserSettings overflow [DO NOT MERGE]" into sc-v2-dev 2024-12-03 20:21:34 +00:00
Treehugger Robot
2112cc5ef9 [automerger skipped] Merge "Don't let profiles open the UserSettings overflow [DO NOT MERGE]" into sc-dev am: ead69f3d43 -s ours am: ad1e470fc0 -s ours
am skip reason: contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/30487387

Change-Id: Ic50acb869e087908f40a44f2701d1a7c6c7a96d8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-12-03 20:16:44 +00:00
Adam Bookatz
d5e5daf68e [automerger skipped] Don't let profiles open the UserSettings overflow [DO NOT MERGE] am: 44a35ac07b -s ours am: 9d81e7d2e5 -s ours
am skip reason: contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/30487387

Change-Id: I1a9ae19f5ecee037bbb6e471ce175c1b4a53643e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-12-03 20:16:38 +00:00
Treehugger Robot
24dc9f533a [automerger skipped] Merge "Don't let profiles open the UserSettings overflow [DO NOT MERGE]" into sc-qpr1-dev am: 8cfbd8aa9b -s ours
am skip reason: contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/30490208

Change-Id: Ied614224826efe4e3dda2bcc6b4b9b3e8b704905
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-12-03 20:16:18 +00:00
Adam Bookatz
1a45fcee73 [automerger skipped] Don't let profiles open the UserSettings overflow [DO NOT MERGE] am: 6f1c499e57 -s ours
am skip reason: contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/30490208

Change-Id: Ic6bdcdeaea0d4e7074f4469281126d33315abc58
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-12-03 20:16:11 +00:00
Treehugger Robot
2b8075716b Merge "Don't let profiles open the UserSettings overflow [DO NOT MERGE]" into tm-dev am: e0e72a57b7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/30490211

Change-Id: Icc114cca75791a256df51901f55242478fb7554c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-12-03 20:16:10 +00:00