Commit Graph

122974 Commits

Author SHA1 Message Date
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
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
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
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
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
cf5d961564 Merge "Set class name when createConfirmDeviceCredentialIntent() API is used." into udc-dev 2025-01-08 17:38:41 -08:00
Chaohui Wang
0691d3040b Merge "[Safer intents] App Time Spent Preference" into udc-dev 2024-12-04 01:27:28 +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
Adam Bookatz
3a58103327 [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 skip reason: contains skip directive

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

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

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

Change-Id: I0fdd771d59956bbdf7e88e52e2a75e06279a6bdc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-12-03 21:40:47 +00:00
Adam Bookatz
bfb7b3d085 [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 skip reason: contains skip directive

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

Change-Id: Iceef742cce37a3badcd35b90ca3f8a18509ba8fa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-12-03 21:40:42 +00:00
Treehugger Robot
7d9e99e5b4 [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: a5078949a1 -s ours
am skip reason: contains skip directive

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

Change-Id: I882d3de17aa31d3f46ea2624c520baf140447f0e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-12-03 21:40:30 +00:00
Adam Bookatz
a1cf0740a7 [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: 647c3b30a7 -s ours
am skip reason: contains skip directive

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

Change-Id: I4d8196c92c4d1b14adae70e891edf2143730f410
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-12-03 21:40:24 +00:00
Treehugger Robot
a0cd22a37e [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: 6f3dce1580 -s ours
am skip reason: contains skip directive

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

Change-Id: I206eb742416665bd1aaad397f0df3a380239671f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-12-03 21:40:13 +00:00
Adam Bookatz
71f3587b1c [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: 9608452666 -s ours
am skip reason: contains skip directive

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

Change-Id: Id60fd7c0f8a453051f3c98d5808354b9e8ef5d25
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-12-03 21:40:07 +00: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
76c8e3526a [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: I664bbd467b88dd3cf5bde24a2f4dd2a504631c78
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-12-03 21:04:50 +00:00
Adam Bookatz
9678e0dd04 [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: I809b51d4cbc558a697f53fc21b3c86b80865e7e8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-12-03 21:04:47 +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
a5078949a1 [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: I99b873bd2df190b957d33a1e7ae0570b0c69efdc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-12-03 21:04:36 +00:00
Adam Bookatz
647c3b30a7 [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: I7b7b90b04d1618b2a73887194c69cd92c743a5d9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-12-03 21:04:33 +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
6f3dce1580 [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: Ie524f742e06fa9683476990c97690ad394a24ca0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-12-03 21:04:21 +00:00
Adam Bookatz
9608452666 [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: I1e17c654fad79b16bf26bca1092df62b1bf634b1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-12-03 21:04:16 +00:00
Treehugger Robot
48986e3c4a [automerger skipped] Merge "Don't let profiles open the UserSettings overflow [DO NOT MERGE]" into tm-dev am: e0e72a57b7 am: 2b8075716b -s ours am: 157d188e4f -s ours
am skip reason: contains skip directive

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

Change-Id: Ide88e9d56a9b3d3afdba7f190aa32ac62d7d1eb1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-12-03 20:53:27 +00:00
Adam Bookatz
c05fe256c9 [automerger skipped] Don't let profiles open the UserSettings overflow [DO NOT MERGE] am: 31e69deb28 am: 88f8eaecd6 -s ours am: aa78945af2 -s ours
am skip reason: contains skip directive

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

Change-Id: I38882aa6e84344d8cfd054e54a20d38b8d0176d2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-12-03 20:53:19 +00:00
Treehugger Robot
16ee9ab16d [automerger skipped] Merge "Don't let profiles open the UserSettings overflow [DO NOT MERGE]" into tm-dev am: e0e72a57b7 am: 30d593d55f -s ours
am skip reason: contains skip directive

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

Change-Id: I48b5c04894f5c2ceb8164c181892adc8e5351e60
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-12-03 20:39:11 +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
ce282b133f [automerger skipped] Don't let profiles open the UserSettings overflow [DO NOT MERGE] am: 31e69deb28 am: 39011f67c4 -s ours
am skip reason: contains skip directive

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

Change-Id: Ib9f2c8e53f359470546344aebd9ee6f482eff4b8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-12-03 20:39:06 +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