Commit Graph

141625 Commits

Author SHA1 Message Date
Chris Antol
3121fffced [automerger skipped] Merge "RESTRICT AUTOMERGE Restrict Settings Homepage prior to provisioning" into sc-dev am: 768eef96cf am: f158052ead -s ours am: 49877d4d16 -s ours am: 63c74b58a0 -s ours am: 26818cc553 -s ours am: 060b6cffd0 -s ours am: 44a17aed24 -s ours am: 4939cc6916 -s ours
am skip reason: contains skip directive

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

Change-Id: I36cad48d1315e9786db24afd3813076fcf0d887c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-24 20:23:36 +00:00
Chris Antol
1adcd6f1ef [automerger skipped] Merge "RESTRICT AUTOMERGE Restrict Settings Homepage prior to provisioning" into sc-dev am: 768eef96cf am: f158052ead -s ours am: 49877d4d16 -s ours am: 63c74b58a0 -s ours am: c5faf1d79a -s ours am: 7205bcad28 -s ours am: dae2288946 -s ours am: c9b74bd2de -s ours
am skip reason: contains skip directive

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

Change-Id: Ieaab615b0110afd626191bd6e2385a8926d3081b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-24 20:23:35 +00:00
Chris Antol
4c497a6342 [automerger skipped] Merge "RESTRICT AUTOMERGE Restrict Settings Homepage prior to provisioning" into tm-qpr-dev am: 38c2736f24 -s ours am: d92e23a691 -s ours am: 4cdfacf392 -s ours
am skip reason: contains skip directive

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

Change-Id: Ibb736334b879a9bba7e6952acc82dcdc0fd5d0db
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-24 20:23:34 +00:00
Chris Antol
6072c5d281 [automerger skipped] RESTRICT AUTOMERGE Restrict Settings Homepage prior to provisioning am: 7f1c4df02d am: 09f1d4c06b -s ours am: b83437b203 -s ours am: 0621f87f2c -s ours am: 676e3e72ea -s ours am: 40e725fa69 -s ours am: 3112d0509e -s ours am: 098c98d694 -s ours
am skip reason: contains skip directive

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

Change-Id: Ied8a393d161c09d17594e7fa846ff00a5114e701
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-24 20:23:32 +00:00
Chris Antol
c0046ecb18 [automerger skipped] RESTRICT AUTOMERGE Restrict Settings Homepage prior to provisioning am: f8dad38722 -s ours am: 0c17f73bf5 -s ours am: 20328aa4c4 -s ours
am skip reason: contains skip directive

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

Change-Id: Ia038579237f66bc45c68d0d2940dae2ba861ca32
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-24 20:23:29 +00:00
Chris Antol
21ee80230e [automerger skipped] RESTRICT AUTOMERGE Restrict Settings Homepage prior to provisioning am: 7f1c4df02d am: 09f1d4c06b -s ours am: b83437b203 -s ours am: 0621f87f2c -s ours am: 0c1eda54b8 -s ours am: f64a344656 -s ours am: 786a98aa51 -s ours am: ad9bae44a1 -s ours
am skip reason: contains skip directive

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

Change-Id: Idedea8d6e7bafffcfba814215d4475ce9f65b42b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-24 20:23:28 +00:00
Automerger Merge Worker
5dfda59d16 Merge changes from topic "am-431565e3efa149ed93bd5f57cfc03b07" into main
* changes:
  [automerger skipped] Merge "RESTRICT AUTOMERGE Restrict Settings Homepage prior to provisioning" into sc-dev am: 768eef96cf am: f158052ead -s ours am: 49877d4d16 -s ours am: 63c74b58a0 -s ours am: c5faf1d79a -s ours am: 7205bcad28 -s ours am: dae2288946 -s ours am: fe306554bd -s ours
  [automerger skipped] RESTRICT AUTOMERGE Restrict Settings Homepage prior to provisioning am: 7f1c4df02d am: 09f1d4c06b -s ours am: b83437b203 -s ours am: 0621f87f2c -s ours am: 676e3e72ea -s ours am: 40e725fa69 -s ours am: 3112d0509e -s ours am: 238e6306df -s ours
2024-06-24 20:23:25 +00:00
Chris Antol
50764f5ff0 [automerger skipped] Merge "RESTRICT AUTOMERGE Restrict Settings Homepage prior to provisioning" into udc-dev am: 4299012bf3 -s ours am: 6cece47720 -s ours
am skip reason: Merged-In I8cbe38109ebf88a0f68f3917e95468a81c6463c1 with SHA-1 7f1c4df02d is already in history

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

Change-Id: Id797d736b0dd30869277aa93e4fef2d842eee6e8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-24 20:23:20 +00:00
Automerger Merge Worker
179d41d740 Merge changes from topic "am-a9f0718c301a4bb587a47379c5068713" into main
* changes:
  [automerger skipped] Merge "RESTRICT AUTOMERGE Restrict Settings Homepage prior to provisioning" into udc-qpr-dev am: cafa795b76 -s ours
  [automerger skipped] RESTRICT AUTOMERGE Restrict Settings Homepage prior to provisioning am: 87ce283623 -s ours
2024-06-24 20:23:17 +00:00
Chris Antol
667634a5f1 [automerger skipped] RESTRICT AUTOMERGE Restrict Settings Homepage prior to provisioning am: c02f4ee193 -s ours am: b372cb5fed -s ours
am skip reason: Merged-In I8cbe38109ebf88a0f68f3917e95468a81c6463c1 with SHA-1 7f1c4df02d is already in history

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

Change-Id: Iab7432dd486f3c3358c5cd5468693988a8c59090
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-24 20:23:16 +00:00
Chris Antol
cd8770f7c0 [automerger skipped] Merge "RESTRICT AUTOMERGE Restrict Settings Homepage prior to provisioning" into sc-dev am: 768eef96cf am: f158052ead -s ours am: 49877d4d16 -s ours am: 63c74b58a0 -s ours am: c5faf1d79a -s ours am: 7205bcad28 -s ours am: dae2288946 -s ours am: fe306554bd -s ours
am skip reason: contains skip directive

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

Change-Id: I6bafea0288c4b26912dc4110de897395889dcfee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-24 20:23:16 +00:00
Chris Antol
d92a0d6d18 [automerger skipped] RESTRICT AUTOMERGE Restrict Settings Homepage prior to provisioning am: 7f1c4df02d am: 09f1d4c06b -s ours am: b83437b203 -s ours am: 0621f87f2c -s ours am: 676e3e72ea -s ours am: 40e725fa69 -s ours am: 3112d0509e -s ours am: 238e6306df -s ours
am skip reason: contains skip directive

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

Change-Id: I84b1c1a047d73da062a19c06ad72c4a17bfbd7f8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-24 20:23:11 +00:00
Chris Antol
822b0ae4ee [automerger skipped] Merge "RESTRICT AUTOMERGE Restrict Settings Homepage prior to provisioning" into sc-qpr1-dev am: c18be19b10 -s ours am: df902e7eeb -s ours
am skip reason: contains skip directive

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

Change-Id: Ia265f1ff8875b29573c8984d131a2a7a49a2af97
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-24 20:23:03 +00:00
Chris Antol
4939cc6916 [automerger skipped] Merge "RESTRICT AUTOMERGE Restrict Settings Homepage prior to provisioning" into sc-dev am: 768eef96cf am: f158052ead -s ours am: 49877d4d16 -s ours am: 63c74b58a0 -s ours am: 26818cc553 -s ours am: 060b6cffd0 -s ours am: 44a17aed24 -s ours
am skip reason: contains skip directive

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

Change-Id: Ibf8ffa789715c22bc2df67a195dc8e6a711cff02
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-24 20:23:03 +00:00
Chris Antol
b0c93e5c67 [automerger skipped] Merge "RESTRICT AUTOMERGE Restrict Settings Homepage prior to provisioning" into udc-qpr-dev am: cafa795b76 -s ours
am skip reason: contains skip directive

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

Change-Id: Id36a978917402c1c6b5cfedb113bc0fcd0a22966
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-24 20:23:03 +00:00
Chris Antol
f8ddb510c7 [automerger skipped] Merge "RESTRICT AUTOMERGE Restrict Settings Homepage prior to provisioning" into udc-dev am: 4299012bf3 -s ours am: bf1984a4e9 -s ours
am skip reason: contains skip directive

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

Change-Id: I46a349985a71dbbfaae11d55b63ffc7fe8790cdc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-24 20:22:58 +00:00
Chris Antol
0f3a56001d [automerger skipped] RESTRICT AUTOMERGE Restrict Settings Homepage prior to provisioning am: 87ce283623 -s ours
am skip reason: contains skip directive

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

Change-Id: Icea26e757a57046bded00709cec3dfc36482c912
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-24 20:22:53 +00:00
Chris Antol
248f8b8d9f [automerger skipped] RESTRICT AUTOMERGE Restrict Settings Homepage prior to provisioning am: b66997fc4e -s ours am: c7ee3d1670 -s ours
am skip reason: contains skip directive

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

Change-Id: I385748011c362687774bed8c4bbd3ca054097e52
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-24 20:22:50 +00:00
Chris Antol
ad9bae44a1 [automerger skipped] RESTRICT AUTOMERGE Restrict Settings Homepage prior to provisioning am: 7f1c4df02d am: 09f1d4c06b -s ours am: b83437b203 -s ours am: 0621f87f2c -s ours am: 0c1eda54b8 -s ours am: f64a344656 -s ours am: 786a98aa51 -s ours
am skip reason: contains skip directive

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

Change-Id: I9418ae056a58f6175686aa340bfc92ddbff6b943
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-24 20:22:50 +00:00
Chris Antol
8510e4a5cd [automerger skipped] RESTRICT AUTOMERGE Restrict Settings Homepage prior to provisioning am: c02f4ee193 -s ours am: 6f9e9a7f0d -s ours
am skip reason: contains skip directive

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

Change-Id: I413d2846b15cd60e8c7399e969ce17211c3ab506
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-24 20:22:50 +00:00
Chris Antol
f9a9383511 [automerger skipped] Merge "RESTRICT AUTOMERGE Restrict Settings Homepage prior to provisioning" into sc-dev am: 768eef96cf am: f158052ead -s ours am: 49877d4d16 -s ours am: 63c74b58a0 -s ours am: 26818cc553 -s ours am: 060b6cffd0 -s ours am: 0c510a1283 -s ours
am skip reason: contains skip directive

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

Change-Id: Idb8ad5a800f703db98d2b701067bfeb76cf28d71
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-24 20:22:34 +00:00
Chris Antol
437ba81130 [automerger skipped] Merge "RESTRICT AUTOMERGE Restrict Settings Homepage prior to provisioning" into sc-v2-dev am: 7fed195ad9 -s ours
am skip reason: contains skip directive

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

Change-Id: Ifdeb98b970651ca19451432f10e502f8441d6164
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-24 20:22:32 +00:00
Chris Antol
34cb87df33 [automerger skipped] RESTRICT AUTOMERGE Restrict Settings Homepage prior to provisioning am: 7f1c4df02d am: 09f1d4c06b -s ours am: b83437b203 -s ours am: 0621f87f2c -s ours am: 0c1eda54b8 -s ours am: f64a344656 -s ours am: 7744478821 -s ours
am skip reason: contains skip directive

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

Change-Id: I6824bd73eefdb5ffddb400cae8a5537f31cd76ab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-24 20:22:28 +00:00
Chris Antol
46283eeefe [automerger skipped] RESTRICT AUTOMERGE Restrict Settings Homepage prior to provisioning am: 2f0db305a6 -s ours
am skip reason: contains skip directive

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

Change-Id: I4b23bf697513f2da855f209b4fcf035f4584c9da
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-24 20:22:24 +00:00
Tetiana Meronyk
0f311e1195 Add handling of admin enforced restrictions in Users Settings
Before, when the restrictions were applied, the preferences that were restricted were hidden.

After this change, if admin applies a restriction, the preference is displayed as disabled and Policy Transparency Dialog is displayed

Bug: 338226475
Test: atest UserSettingsTest && atest UserDetailsSettingsTest
Flag: android.multiuser.new_multiuser_settings_ux
Change-Id: I1b5aeeeec7accde278ff3e46ea3d64c91d8400db
2024-06-24 20:22:16 +00:00
Chris Antol
63e3d91b32 [automerger skipped] Merge "RESTRICT AUTOMERGE Restrict Settings Homepage prior to provisioning" into tm-dev am: 477f4f21f0 -s ours
am skip reason: Merged-In I8cbe38109ebf88a0f68f3917e95468a81c6463c1 with SHA-1 7f1c4df02d is already in history

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

Change-Id: Id29a7c4c325af4df837d904bec2eb406abdead53
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-24 20:17:20 +00:00
Chris Antol
de606472d0 [automerger skipped] Merge "RESTRICT AUTOMERGE Restrict Settings Homepage prior to provisioning" into tm-dev am: 477f4f21f0 -s ours
am skip reason: Merged-In I8cbe38109ebf88a0f68f3917e95468a81c6463c1 with SHA-1 7f1c4df02d is already in history

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

Change-Id: I8f2b4e963c2e85661ada521a88fd8c89f0d13d25
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-24 20:17:16 +00:00
Chris Antol
c909913f89 [automerger skipped] RESTRICT AUTOMERGE Restrict Settings Homepage prior to provisioning am: d83f47397e -s ours
am skip reason: Merged-In I8cbe38109ebf88a0f68f3917e95468a81c6463c1 with SHA-1 7f1c4df02d is already in history

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

Change-Id: I03ee7cab0cc090fcd41fa313551ecc3416cef49e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-24 20:17:14 +00:00
Chris Antol
964534a7bb [automerger skipped] RESTRICT AUTOMERGE Restrict Settings Homepage prior to provisioning am: d83f47397e -s ours
am skip reason: Merged-In I8cbe38109ebf88a0f68f3917e95468a81c6463c1 with SHA-1 7f1c4df02d is already in history

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

Change-Id: I71f1760129426f55ca9fde0956c945d52afc76ee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-24 20:17:13 +00:00
Chris Antol
85ea20781d [automerger skipped] Merge "RESTRICT AUTOMERGE Restrict Settings Homepage prior to provisioning" into tm-qpr-dev am: 38c2736f24 -s ours am: d92e23a691 -s ours
am skip reason: contains skip directive

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

Change-Id: Ibe070c043756fa9378b85fad7ee09414c642366f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-24 20:16:58 +00:00
Chris Antol
b0739c7152 [automerger skipped] RESTRICT AUTOMERGE Restrict Settings Homepage prior to provisioning am: f8dad38722 -s ours am: 0c17f73bf5 -s ours
am skip reason: contains skip directive

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

Change-Id: I05a1ee8745082f046eb1266b7a472ec9d523dd6e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-24 20:16:50 +00:00
Chris Antol
df902e7eeb [automerger skipped] Merge "RESTRICT AUTOMERGE Restrict Settings Homepage prior to provisioning" into sc-qpr1-dev am: c18be19b10 -s ours
am skip reason: contains skip directive

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

Change-Id: I4ef44d4b39fe6051b4849cfa917c1d160c625f72
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-24 20:16:44 +00:00
Chris Antol
c7ee3d1670 [automerger skipped] RESTRICT AUTOMERGE Restrict Settings Homepage prior to provisioning am: b66997fc4e -s ours
am skip reason: contains skip directive

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

Change-Id: Ie58434a2a765d1fbfa6436433d84d80763838d09
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-24 20:16:36 +00:00
Chris Antol
4cdfacf392 [automerger skipped] Merge "RESTRICT AUTOMERGE Restrict Settings Homepage prior to provisioning" into tm-qpr-dev am: 38c2736f24 -s ours am: d92e23a691 -s ours
am skip reason: contains skip directive

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

Change-Id: I8000311fd4f5e581b7868d169b10b68438312bca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-24 20:13:52 +00:00
Chris Antol
20328aa4c4 [automerger skipped] RESTRICT AUTOMERGE Restrict Settings Homepage prior to provisioning am: f8dad38722 -s ours am: 0c17f73bf5 -s ours
am skip reason: contains skip directive

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

Change-Id: Id2b5975b1d8cc3c55f3870e6106004639c2e4dfd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-24 20:13:48 +00:00
Chris Antol
fe306554bd [automerger skipped] Merge "RESTRICT AUTOMERGE Restrict Settings Homepage prior to provisioning" into sc-dev am: 768eef96cf am: f158052ead -s ours am: 49877d4d16 -s ours am: 63c74b58a0 -s ours am: c5faf1d79a -s ours am: 7205bcad28 -s ours am: dae2288946 -s ours
am skip reason: contains skip directive

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

Change-Id: I5fbb86d87c879642c498f4ac39c99e03b68216e1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-24 20:13:36 +00:00
Chris Antol
238e6306df [automerger skipped] RESTRICT AUTOMERGE Restrict Settings Homepage prior to provisioning am: 7f1c4df02d am: 09f1d4c06b -s ours am: b83437b203 -s ours am: 0621f87f2c -s ours am: 676e3e72ea -s ours am: 40e725fa69 -s ours am: 3112d0509e -s ours
am skip reason: contains skip directive

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

Change-Id: I195a35610c48ba1c713fd33ee667f077d1bd46a1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-24 20:13:31 +00:00
Chris Antol
bf1984a4e9 [automerger skipped] Merge "RESTRICT AUTOMERGE Restrict Settings Homepage prior to provisioning" into udc-dev am: 4299012bf3 -s ours
am skip reason: Merged-In I8cbe38109ebf88a0f68f3917e95468a81c6463c1 with SHA-1 7f1c4df02d is already in history

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

Change-Id: I3b07883c611718bae54aa34ca6486f1fc1050081
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-24 20:13:02 +00:00
Chris Antol
d92e23a691 [automerger skipped] Merge "RESTRICT AUTOMERGE Restrict Settings Homepage prior to provisioning" into tm-qpr-dev am: 38c2736f24 -s ours
am skip reason: contains skip directive

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

Change-Id: I6b4aacc5b75e5ca24a260aca39a46539e8e51933
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-24 20:13:00 +00:00
Chris Antol
6f9e9a7f0d [automerger skipped] RESTRICT AUTOMERGE Restrict Settings Homepage prior to provisioning am: c02f4ee193 -s ours
am skip reason: Merged-In I8cbe38109ebf88a0f68f3917e95468a81c6463c1 with SHA-1 7f1c4df02d is already in history

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

Change-Id: Ifa560dcd8fe269a0dec1dd5473c9efc5f1e98a14
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-24 20:12:56 +00:00
Chris Antol
0c17f73bf5 [automerger skipped] RESTRICT AUTOMERGE Restrict Settings Homepage prior to provisioning am: f8dad38722 -s ours
am skip reason: contains skip directive

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

Change-Id: I5b1e936fcb3e890df1836d377a9195d7638eb77b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-24 20:12:55 +00:00
Chris Antol
c9b74bd2de [automerger skipped] Merge "RESTRICT AUTOMERGE Restrict Settings Homepage prior to provisioning" into sc-dev am: 768eef96cf am: f158052ead -s ours am: 49877d4d16 -s ours am: 63c74b58a0 -s ours am: c5faf1d79a -s ours am: 7205bcad28 -s ours am: dae2288946 -s ours
am skip reason: contains skip directive

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

Change-Id: Ia56e12927e18fac1eecd953a5b29011605f85a3a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-24 20:12:53 +00:00
Chris Antol
098c98d694 [automerger skipped] RESTRICT AUTOMERGE Restrict Settings Homepage prior to provisioning am: 7f1c4df02d am: 09f1d4c06b -s ours am: b83437b203 -s ours am: 0621f87f2c -s ours am: 676e3e72ea -s ours am: 40e725fa69 -s ours am: 3112d0509e -s ours
am skip reason: contains skip directive

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

Change-Id: I08cc2040b08afe5bdaa247762497003b2bf5aca1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-24 20:12:50 +00:00
Chris Antol
6cece47720 [automerger skipped] Merge "RESTRICT AUTOMERGE Restrict Settings Homepage prior to provisioning" into udc-dev am: 4299012bf3 -s ours
am skip reason: Merged-In I8cbe38109ebf88a0f68f3917e95468a81c6463c1 with SHA-1 7f1c4df02d is already in history

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

Change-Id: Ib53ed62c880185ae978f3f0e2b0b2507b70bb0ea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-24 20:12:39 +00:00
Chris Antol
b372cb5fed [automerger skipped] RESTRICT AUTOMERGE Restrict Settings Homepage prior to provisioning am: c02f4ee193 -s ours
am skip reason: Merged-In I8cbe38109ebf88a0f68f3917e95468a81c6463c1 with SHA-1 7f1c4df02d is already in history

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

Change-Id: Icf6f53222b0c6e384a45fa4cfcff1c9417e7fdd1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-24 20:12:35 +00:00
Chris Antol
0c510a1283 [automerger skipped] Merge "RESTRICT AUTOMERGE Restrict Settings Homepage prior to provisioning" into sc-dev am: 768eef96cf am: f158052ead -s ours am: 49877d4d16 -s ours am: 63c74b58a0 -s ours am: 26818cc553 -s ours am: 060b6cffd0 -s ours
am skip reason: contains skip directive

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

Change-Id: I31bd2139d47bfb434c23ab7ff7c276f26747e84f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-24 20:12:14 +00:00
Chris Antol
7744478821 [automerger skipped] RESTRICT AUTOMERGE Restrict Settings Homepage prior to provisioning am: 7f1c4df02d am: 09f1d4c06b -s ours am: b83437b203 -s ours am: 0621f87f2c -s ours am: 0c1eda54b8 -s ours am: f64a344656 -s ours
am skip reason: contains skip directive

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

Change-Id: I17fa8e1b57893ad3e2ea07f510c9649a1872b350
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-24 20:12:11 +00:00
Chris Antol
dae2288946 [automerger skipped] Merge "RESTRICT AUTOMERGE Restrict Settings Homepage prior to provisioning" into sc-dev am: 768eef96cf am: f158052ead -s ours am: 49877d4d16 -s ours am: 63c74b58a0 -s ours am: c5faf1d79a -s ours am: 7205bcad28 -s ours
am skip reason: contains skip directive

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

Change-Id: Id51edd329e377127ae0d350b1d1b6519c61b155e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-24 20:12:03 +00:00
Chris Antol
3112d0509e [automerger skipped] RESTRICT AUTOMERGE Restrict Settings Homepage prior to provisioning am: 7f1c4df02d am: 09f1d4c06b -s ours am: b83437b203 -s ours am: 0621f87f2c -s ours am: 676e3e72ea -s ours am: 40e725fa69 -s ours
am skip reason: contains skip directive

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

Change-Id: I514759ba146dbf2c7a9fe4af1cf183a979ef1ce6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-24 20:11:57 +00:00
Chris Antol
44a17aed24 [automerger skipped] Merge "RESTRICT AUTOMERGE Restrict Settings Homepage prior to provisioning" into sc-dev am: 768eef96cf am: f158052ead -s ours am: 49877d4d16 -s ours am: 63c74b58a0 -s ours am: 26818cc553 -s ours am: 060b6cffd0 -s ours
am skip reason: contains skip directive

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

Change-Id: I4eb56c391bf0da0d3ce937bc7173f8d2f2b6879c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-24 20:11:49 +00:00