Commit Graph

124467 Commits

Author SHA1 Message Date
Hao Dong
8c4d5f0575 [automerger skipped] Merge "Set class name when createConfirmDeviceCredentialIntent() API is used." into sc-qpr1-dev am: aad0b6827b -s ours am: dc418ca7bf -s ours am: 6f3bb938f7 -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: Ifb24320444a5ebc88a1a99306b7091cbbdab8e21
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2025-01-09 12:47:40 -08:00
Hao Dong
d7aee3ecb3 [automerger skipped] Set class name when createConfirmDeviceCredentialIntent() API is used. am: c70e6bf477 -s ours am: 717ffa9a1b -s ours am: 97e41c368d -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: I63bf3d8c1a22edfba8c3cb48d3afcedaa4da1785
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2025-01-09 12:47:36 -08:00
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
04392610ce [automerger skipped] Merge "Set class name when createConfirmDeviceCredentialIntent() API is used." into sc-v2-dev am: a0b42f7f95 -s ours am: 66f8db84d6 -s ours am: 596ca04d69 -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: I4a868568ee590306adbe793adcf1d9c0bd4b8b6a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2025-01-09 10:20:30 -08:00
Hao Dong
a76c571b37 [automerger skipped] Set class name when createConfirmDeviceCredentialIntent() API is used. am: 417970a8ca -s ours am: 19c298d5a9 -s ours am: 9c190ed43b -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: Idbfdf53b509529d463abd6b6403ec72649abba0b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2025-01-09 10:20:21 -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
596ca04d69 [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: I65f0591d5cc3aaca0d4e88c7a7cd05993cbf334d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2025-01-09 09:55:22 -08:00
Hao Dong
9c190ed43b [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: Ia6a803d7686a3eeff7a8912e429766f003d2beed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2025-01-09 09:55:17 -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
ba4746f0fe [automerger skipped] Merge "Set class name when createConfirmDeviceCredentialIntent() API is used." into tm-dev am: 5b67d6e863 am: 90fc883217 -s ours
am skip reason: Merged-In I762f280def79d428ed9cf119ace5ccc2b6be2560 with SHA-1 d158b1675a is already in history

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

Change-Id: Id9ca9553b0b6dc6d40df8b869f62cfc0b86ff0d6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2025-01-08 22:23:03 -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
90fc883217 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: Ie407bca1d30057b2f69330d22368d408ec3978ea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2025-01-08 21:57:58 -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
f401662091 [automerger skipped] Merge "Set class name when createConfirmDeviceCredentialIntent() API is used." into tm-qpr-dev am: ccd03aaeb9 -s ours
am skip reason: Merged-In I762f280def79d428ed9cf119ace5ccc2b6be2560 with SHA-1 63eda7f3a9 is already in history

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

Change-Id: I89a740dd4e878a2678c87c48cc397825f96a378b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2025-01-08 20:07:02 -08:00
Hao Dong
6dc020526f [automerger skipped] Set class name when createConfirmDeviceCredentialIntent() API is used. am: d158b1675a -s ours
am skip reason: Merged-In I762f280def79d428ed9cf119ace5ccc2b6be2560 with SHA-1 63eda7f3a9 is already in history

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

Change-Id: I8567eaa2465f9af1330ca8b3892be9d50cfb17e4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2025-01-08 20:06:52 -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
Hao Dong
fe69b57d4c Merge "Set class name when createConfirmDeviceCredentialIntent() API is used." into udc-dev am: cf5d961564
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/28785157

Bug: 388628639
Change-Id: Ic1813245fa86ad9e3c6f5e19741f63cc8cb51816
Merged-In: I762f280def79d428ed9cf119ace5ccc2b6be2560
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2025-01-08 19:37:17 -08:00
Hao Dong
cf5d961564 Merge "Set class name when createConfirmDeviceCredentialIntent() API is used." into udc-dev 2025-01-08 17:38:41 -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
Mill Chen
7a2366b0f1 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:00:47 -08:00
Chaohui Wang
3c8101a303 Merge "[Safer intents] App Time Spent Preference" into udc-dev am: 0691d3040b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/30341738

Change-Id: Iaed38eeb96a64f84330b2115372c8bd7a5728d6c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-12-04 02:09:43 +00:00
Chaohui Wang
0691d3040b Merge "[Safer intents] App Time Spent Preference" into udc-dev 2024-12-04 01:27:28 +00:00
Treehugger Robot
4b46ccbb01 [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: e37a2247f1 -s ours am: 955fef7066 -s ours
am skip reason: contains skip directive

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

Change-Id: I7cba4d7e0084d5b4cfda1aaa0cba3204141867c1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-12-03 22:12:54 +00:00
Adam Bookatz
5f3b94784d [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: 055a2bca93 -s ours am: 351ece5890 -s ours
am skip reason: contains skip directive

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

Change-Id: Iff03e82fc30728c0d4f9c746fc6371b686902529
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-12-03 22:12:50 +00:00
Treehugger Robot
c5f6c73e35 [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: 8ab0f1de3c -s ours am: 0c1c752f7d -s ours
am skip reason: contains skip directive

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

Change-Id: I219b937f4a069ca585b294f8fd035b5ce96f51e2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-12-03 22:12:40 +00:00
Adam Bookatz
0fdc0440e7 [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: 37173a8dfb -s ours am: 6329c66f26 -s ours
am skip reason: contains skip directive

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

Change-Id: I6f7e5eb2505fba35a62e5265f5fd08139655d104
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-12-03 22:12:37 +00:00
Treehugger Robot
a0094fdcc6 [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: 2060250a81 -s ours am: f371a98737 -s ours
am skip reason: contains skip directive

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

Change-Id: Ib8ce11d9317f82ec382a1f4397b22269c86185dc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-12-03 22:12:25 +00:00
Adam Bookatz
226634c104 [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: 1db07ae91a -s ours am: 3a58103327 -s ours
am skip reason: contains skip directive

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

Change-Id: I0777ccfc5754134d362e0a03b9e1f95e0ab35be9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-12-03 22:12:22 +00:00
Treehugger Robot
955fef7066 [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: e37a2247f1 -s ours
am skip reason: contains skip directive

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

Change-Id: Ideca8b59f0989b915d45db43840e52d30a1c8c22
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-12-03 22:02:03 +00:00
Adam Bookatz
351ece5890 [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: 055a2bca93 -s ours
am skip reason: contains skip directive

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

Change-Id: I70840d2acdf38a659d7eb02426e3b0814277d702
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-12-03 22:01:57 +00:00
Treehugger Robot
0c1c752f7d [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: 8ab0f1de3c -s ours
am skip reason: contains skip directive

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

Change-Id: Ib739d1caeb4227945b2af18f6147d40a81894205
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-12-03 22:01:41 +00:00
Adam Bookatz
6329c66f26 [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: 37173a8dfb -s ours
am skip reason: contains skip directive

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

Change-Id: Ie15340c86d29915400752ed27c74dc05be4795a5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-12-03 22:01:36 +00:00
Treehugger Robot
f371a98737 [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: 2060250a81 -s ours
am skip reason: contains skip directive

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

Change-Id: Ia39669de6a0381b1434a01e9eae57ec53cb9162a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-12-03 22:01:22 +00:00
Treehugger Robot
f6b7dbd34f [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: 76c8e3526a -s ours am: ac9402af41 -s ours
am skip reason: contains skip directive

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

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

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

Change-Id: I8d91ff61268a0f3aa98c5ffbb504194cbec6d0b6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-12-03 22:01:17 +00:00