Chris Antol
6fce978ab9
[automerger skipped] Merge "RESTRICT AUTOMERGE Restrict Settings Homepage prior to provisioning" into sc-v2-dev am: 7fed195ad9 -s ours am: 437ba81130 -s ours am: 59b6740a52 -s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/26737747
Change-Id: I50a6c1d6c85d69c3f0c8fd19f963b258dc36f285
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-06-24 20:52:00 +00:00
Chris Antol
b57c17e1de
[automerger skipped] RESTRICT AUTOMERGE Restrict Settings Homepage prior to provisioning am: d83f47397e -s ours am: 964534a7bb -s ours am: 3f9075453e -s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/26737807
Change-Id: I6959139358b3dc15677e6b115df0d38b5f6d7b8d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-06-24 20:51:54 +00:00
Chris Antol
4293259a45
[automerger skipped] RESTRICT AUTOMERGE Restrict Settings Homepage prior to provisioning am: 2f0db305a6 -s ours am: 46283eeefe -s ours am: 54eb16a0ec -s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/26737747
Change-Id: I453ad0cfc1d699b28453db1e47bf053d9946bfec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-06-24 20:51:54 +00:00
Chris Antol
4b9488fe71
[automerger skipped] Merge "RESTRICT AUTOMERGE Restrict Settings Homepage prior to provisioning" into sc-qpr1-dev am: c18be19b10 -s ours am: df902e7eeb -s ours am: 822b0ae4ee -s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/26737529
Change-Id: I01abefb39f5d7b757e0afea4c5d0270057b02b76
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-06-24 20:39:07 +00:00
Chris Antol
694378b3da
[automerger skipped] Merge "RESTRICT AUTOMERGE Restrict Settings Homepage prior to provisioning" into sc-qpr1-dev am: c18be19b10 -s ours am: df902e7eeb -s ours am: 822b0ae4ee -s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/26737529
Change-Id: Ib9d1d866c656e963fa369113992e33b9005f0cda
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-06-24 20:39:07 +00:00
Chris Antol
68fd19a9df
[automerger skipped] RESTRICT AUTOMERGE Restrict Settings Homepage prior to provisioning am: b66997fc4e -s ours am: c7ee3d1670 -s ours am: 248f8b8d9f -s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/26737529
Change-Id: If26c980b21652274bcbf2ef638824f7d871de7c7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-06-24 20:39:05 +00:00
Chris Antol
26e556ab9e
[automerger skipped] RESTRICT AUTOMERGE Restrict Settings Homepage prior to provisioning am: b66997fc4e -s ours am: c7ee3d1670 -s ours am: 248f8b8d9f -s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/26737529
Change-Id: I8e10cb1985370f3e23800aeee0c607b7241e02bc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-06-24 20:39:04 +00:00
Chris Antol
59b6740a52
[automerger skipped] Merge "RESTRICT AUTOMERGE Restrict Settings Homepage prior to provisioning" into sc-v2-dev am: 7fed195ad9 -s ours am: 437ba81130 -s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/26737747
Change-Id: I366573aba963027ecb27346c9d7655fa4ef2d5b1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-06-24 20:38:54 +00:00
Chris Antol
9bf862fefb
[automerger skipped] Merge "RESTRICT AUTOMERGE Restrict Settings Homepage prior to provisioning" into sc-v2-dev am: 7fed195ad9 -s ours am: 437ba81130 -s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/26737747
Change-Id: I1538adb5f25edc93e2bfc0341850edaaf9d834fa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-06-24 20:38:53 +00:00
Chris Antol
54eb16a0ec
[automerger skipped] RESTRICT AUTOMERGE Restrict Settings Homepage prior to provisioning am: 2f0db305a6 -s ours am: 46283eeefe -s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/26737747
Change-Id: I8660c4d40c457b0d10c16a7901172cefcc96bb01
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-06-24 20:38:50 +00:00
Chris Antol
744e414e26
[automerger skipped] RESTRICT AUTOMERGE Restrict Settings Homepage prior to provisioning am: 2f0db305a6 -s ours am: 46283eeefe -s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/26737747
Change-Id: If433bf8e34d10a098b73e36d9436cc139410a8df
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-06-24 20:38:48 +00:00
Chris Antol
697b9a5bd7
[automerger skipped] Merge "RESTRICT AUTOMERGE Restrict Settings Homepage prior to provisioning" into tm-dev am: 477f4f21f0 -s ours am: de606472d0 -s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/26737807
Change-Id: I60b2d56b4c1ad8c3c74ae2edd3531a23cfe75ea2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-06-24 20:32:36 +00:00
Chris Antol
3f9075453e
[automerger skipped] RESTRICT AUTOMERGE Restrict Settings Homepage prior to provisioning am: d83f47397e -s ours am: 964534a7bb -s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/26737807
Change-Id: I6ccc4ff8c101b2480b57010abe75ee4caf01dd5a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-06-24 20:32:28 +00:00
Chris Antol
822c7c26ee
[automerger skipped] Merge "RESTRICT AUTOMERGE Restrict Settings Homepage prior to provisioning" into tm-dev am: 477f4f21f0 -s ours am: 63e3d91b32 -s ours
...
am skip reason: Merged-In I8cbe38109ebf88a0f68f3917e95468a81c6463c1 with SHA-1 7f1c4df02dhttps://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/26737807
Change-Id: I49290d8f10c6b8420e7a323965c335dac4aa5e79
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-06-24 20:32:04 +00:00
Chris Antol
1ff5669883
[automerger skipped] RESTRICT AUTOMERGE Restrict Settings Homepage prior to provisioning am: d83f47397e -s ours am: c909913f89 -s ours
...
am skip reason: Merged-In I8cbe38109ebf88a0f68f3917e95468a81c6463c1 with SHA-1 7f1c4df02dhttps://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/26737807
Change-Id: I5b20237b2a96858f88291a8ff0b05f5192c94785
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-06-24 20:31:59 +00:00
Chris Antol
8ca1270c06
[automerger skipped] Merge "RESTRICT AUTOMERGE Restrict Settings Homepage prior to provisioning" into tm-qpr-dev am: 38c2736f24 -s ours am: d92e23a691 -s ours am: 85ea20781d -s ours am: c975083e46 -s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/26737748
Change-Id: Ib79fe3f20efe681454cbca1e3eca8cb4152d150f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-06-24 20:24:54 +00:00
Chris Antol
5cc6d9e64f
[automerger skipped] RESTRICT AUTOMERGE Restrict Settings Homepage prior to provisioning am: f8dad38722 -s ours am: 0c17f73bf5 -s ours am: b0739c7152 -s ours am: 8ec233ce92 -s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/26737748
Change-Id: I9987091fff2b38f6088bf13d0e7d6fc4c044ecc1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-06-24 20:24:49 +00:00
Chris Antol
6718cf704d
[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: 1adcd6f1ef -s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/26737530
Change-Id: I57ac78e051e52f10083f3f794ed81414cef41eef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-06-24 20:24:31 +00:00
Chris Antol
70bf48583a
[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: 6072c5d281 -s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/26737530
Change-Id: I6b400b5759bf02ccebf82cf127e2642914627402
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-06-24 20:24:26 +00:00
Chris Antol
e96f452bbc
[automerger skipped] Merge "RESTRICT AUTOMERGE Restrict Settings Homepage prior to provisioning" into udc-dev am: 4299012bf3 -s ours am: 6cece47720 -s ours am: 50764f5ff0 -s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/26737528
Change-Id: Ia1a2fa40c1796c43c1d59057cdb2484f41ec9cbf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-06-24 20:24:04 +00:00
Chris Antol
faeb58c515
[automerger skipped] RESTRICT AUTOMERGE Restrict Settings Homepage prior to provisioning am: c02f4ee193 -s ours am: b372cb5fed -s ours am: 667634a5f1 -s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/26737528
Change-Id: Ie53a5ebe3d64d0b8882fce2131091882800843df
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-06-24 20:23:58 +00:00
Chris Antol
c975083e46
[automerger skipped] Merge "RESTRICT AUTOMERGE Restrict Settings Homepage prior to provisioning" into tm-qpr-dev am: 38c2736f24 -s ours am: d92e23a691 -s ours am: 85ea20781d -s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/26737748
Change-Id: I2d60cdf89b3c6e7b5af96fcc3d7a2ff61f846de8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-06-24 20:23:49 +00:00
Automerger Merge Worker
c941deba62
Merge changes from topic "am-699faa000aaa4f2a94589911cef091e9" into main
...
* changes:
[automerger skipped] Merge "RESTRICT AUTOMERGE Restrict Settings Homepage prior to provisioning" into sc-dev am: 768eef96cff158052ead49877d4d1663c74b58a026818cc553060b6cffd044a17aed244939cc69167f1c4df02d09f1d4c06bb83437b2030621f87f2c0c1eda54b8f64a344656786a98aa51ad9bae44a1
2024-06-24 20:23:48 +00:00
Chris Antol
8ec233ce92
[automerger skipped] RESTRICT AUTOMERGE Restrict Settings Homepage prior to provisioning am: f8dad38722 -s ours am: 0c17f73bf5 -s ours am: b0739c7152 -s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/26737748
Change-Id: I0d395cd973efa6858a901b80e073eb39a07f23a8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-06-24 20:23:46 +00:00
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: 768eef96cff158052ead49877d4d1663c74b58a0c5faf1d79a7205bcad28dae2288946fe306554bd7f1c4df02d09f1d4c06bb83437b2030621f87f2c676e3e72ea40e725fa693112d0509e238e6306df
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 7f1c4df02dhttps://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: cafa795b7687ce283623
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 7f1c4df02dhttps://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 7f1c4df02dhttps://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
