PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
122,988 Commits 1 Branch 0 Tags
f8e44f03e7079e7da38f5420ba1031a72274d79d
Commit Graph

122988 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Yiling Chuang
77f4888ead [automerger skipped] RESTRICT AUTOMERGE FRP bypass defense in App battery usage page am: c9d2588c69 -s ours am: b3f4ad63ea -s ours am: fa44fa018a -s ours 
am skip reason: contains skip directive

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

Change-Id: Ibf881b7aeae204a68bd4c5e3eac33350926f46fb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-08-02 17:17:57 +00:00
Yiling Chuang
4d263156f8 RESTRICT AUTOMERGE FRP bypass defense in App battery usage page am: 23b88e0724 am: eae022088f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/28550763

Change-Id: I223966ef871fa55ecc5a53643f0479327978fe33
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-08-02 17:17:47 +00:00
Yiling Chuang
965ab0d25d [automerger skipped] RESTRICT AUTOMERGE FRP bypass defense in App battery usage page am: 0c097d5c0d -s ours am: c8c879acee -s ours am: 708a24009c -s ours 
am skip reason: contains skip directive

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

Change-Id: I774886c4daaf2e0570d1347a1ade6e0887dd9a37
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-08-02 17:17:42 +00:00
Yiling Chuang
708a24009c [automerger skipped] RESTRICT AUTOMERGE FRP bypass defense in App battery usage page am: 0c097d5c0d -s ours am: c8c879acee -s ours 
am skip reason: contains skip directive

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

Change-Id: Ie47a152b5f564fd8eeaa7cf617ebbe583f8d089f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-08-02 17:07:32 +00:00
Yiling Chuang
f2e95596f7 [automerger skipped] RESTRICT AUTOMERGE FRP bypass defense in App battery usage page am: 3c2a216bbb -s ours am: b0ecfd2b86 -s ours am: 280948fb1c -s ours 
am skip reason: contains skip directive

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

Change-Id: I81aac27972ab693bc52a02b9e18f8fc89413e346
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-08-02 17:01:38 +00:00
Yiling Chuang
32db633219 [automerger skipped] RESTRICT AUTOMERGE FRP bypass defense in App battery usage page am: 3c2a216bbb -s ours am: b0ecfd2b86 -s ours am: 280948fb1c -s ours 
am skip reason: contains skip directive

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

Change-Id: I8ad48df906ece3f82c7746f331fea471b1047208
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-08-02 17:01:36 +00:00
Yiling Chuang
fa44fa018a [automerger skipped] RESTRICT AUTOMERGE FRP bypass defense in App battery usage page am: c9d2588c69 -s ours am: b3f4ad63ea -s ours 
am skip reason: contains skip directive

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

Change-Id: I0213004838d781340e38d9cf1723440dd66ae6ca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-08-02 17:01:26 +00:00
Yiling Chuang
7efbf62816 [automerger skipped] RESTRICT AUTOMERGE FRP bypass defense in App battery usage page am: c9d2588c69 -s ours am: b3f4ad63ea -s ours 
am skip reason: contains skip directive

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

Change-Id: Ia1a1b7e1361a4f3ec5c312a7145edcb45d51b65c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-08-02 17:01:23 +00:00
Yiling Chuang
c8c879acee [automerger skipped] RESTRICT AUTOMERGE FRP bypass defense in App battery usage page am: 0c097d5c0d -s ours 
am skip reason: Merged-In I486820ca2afecc02729a56a3c531fb931c1907d0 with SHA-1 3c2a216bbb is already in history

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

Change-Id: I40a44b4239991dc66564a95b8c82059a47830038
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-08-02 17:01:15 +00:00
Yiling Chuang
eae022088f RESTRICT AUTOMERGE FRP bypass defense in App battery usage page am: 23b88e0724 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/28550763

Change-Id: Ic394804c1f515b4e9a3fd4fae3df77c8d27b116a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-08-02 17:01:14 +00:00
Yiling Chuang
5fc9c5c21f RESTRICT AUTOMERGE FRP bypass defense in App battery usage page am: 23b88e0724 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/28550763

Change-Id: I164a16363045bf8ac2bd1a7ce2b77a45812351a7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-08-02 17:01:06 +00:00
Yiling Chuang
280948fb1c [automerger skipped] RESTRICT AUTOMERGE FRP bypass defense in App battery usage page am: 3c2a216bbb -s ours am: b0ecfd2b86 -s ours 
am skip reason: contains skip directive

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

Change-Id: I0b5537d0d7a7e20ee181b1a4d3b9187ef37c2640
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-08-02 17:00:58 +00:00
Yiling Chuang
b3f4ad63ea [automerger skipped] RESTRICT AUTOMERGE FRP bypass defense in App battery usage page am: c9d2588c69 -s ours 
am skip reason: contains skip directive

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

Change-Id: I867bf55f8636c7daf1e5431769e0c3ee5266b9c9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-08-02 17:00:38 +00:00
Yiling Chuang
b0ecfd2b86 [automerger skipped] RESTRICT AUTOMERGE FRP bypass defense in App battery usage page am: 3c2a216bbb -s ours 
am skip reason: contains skip directive

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

Change-Id: I6165b67d64c40cd44a49aae95f87524f7dbb0228
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-08-02 17:00:37 +00:00
Yiling Chuang
2659f8416c RESTRICT AUTOMERGE FRP bypass defense in App battery usage page 
Before the setup flow completion, don't allow the app info page in App battery usage to be launched.

Bug: 327748846
Test: atest SettingsRoboTests + manual test
- factory reset + launch app battery usage app info via ADB during Setup -> verify app closes
Flag : EXEMPT bugfix

Change-Id: I486820ca2afecc02729a56a3c531fb931c1907d0
Merged-In: I486820ca2afecc02729a56a3c531fb931c1907d0
(cherry picked from commit 419a6a9079)
 2024-07-31 07:36:04 +00:00
Yiling Chuang
0e903bfe7f RESTRICT AUTOMERGE FRP bypass defense in App battery usage page 
Before the setup flow completion, don't allow the app info page in App battery usage to be launched.

Bug: 327748846
Test: atest SettingsRoboTests + manual test
- factory reset + launch app battery usage app info via ADB during Setup -> verify app closes
Flag : EXEMPT bugfix

Change-Id: I486820ca2afecc02729a56a3c531fb931c1907d0
Merged-In: I486820ca2afecc02729a56a3c531fb931c1907d0
(cherry picked from commit 419a6a9079)
 2024-07-31 07:21:54 +00:00
Yiling Chuang
23b88e0724 RESTRICT AUTOMERGE FRP bypass defense in App battery usage page 
Before the setup flow completion, don't allow the app info page in App battery usage to be launched.

Bug: 327748846
Test: atest SettingsRoboTests + manual test
- factory reset + launch app battery usage app info via ADB during Setup -> verify app closes
Flag : EXEMPT bugfix

Change-Id: I486820ca2afecc02729a56a3c531fb931c1907d0
Merged-In: I486820ca2afecc02729a56a3c531fb931c1907d0
(cherry picked from commit 419a6a9079)
 2024-07-31 07:18:16 +00:00
Yiling Chuang
c9d2588c69 RESTRICT AUTOMERGE FRP bypass defense in App battery usage page 
Before the setup flow completion, don't allow the app info page in App battery usage to be launched.

Bug: 327748846
Test: atest SettingsRoboTests + manual test
- factory reset + launch app battery usage app info via ADB during Setup -> verify app closes
Flag : EXEMPT bugfix

Change-Id: I486820ca2afecc02729a56a3c531fb931c1907d0
Merged-In: I486820ca2afecc02729a56a3c531fb931c1907d0
(cherry picked from commit 419a6a9079)
 2024-07-31 07:06:38 +00:00
Yiling Chuang
3c2a216bbb RESTRICT AUTOMERGE FRP bypass defense in App battery usage page 
Before the setup flow completion, don't allow the app info page in App battery usage to be launched.

Bug: 327748846
Test: atest SettingsRoboTests + manual test
- factory reset + launch app battery usage app info via ADB during Setup -> verify app closes
Flag : EXEMPT bugfix

Change-Id: I486820ca2afecc02729a56a3c531fb931c1907d0
Merged-In: I486820ca2afecc02729a56a3c531fb931c1907d0
(cherry picked from commit 419a6a9079)
 2024-07-31 07:04:20 +00:00
Yiling Chuang
0c097d5c0d RESTRICT AUTOMERGE FRP bypass defense in App battery usage page 
Before the setup flow completion, don't allow the app info page in App battery usage to be launched.

Bug: 327748846
Test: atest SettingsRoboTests + manual test
- factory reset + launch app battery usage app info via ADB during Setup -> verify app closes
Flag : EXEMPT bugfix

Change-Id: I486820ca2afecc02729a56a3c531fb931c1907d0
Merged-In: I486820ca2afecc02729a56a3c531fb931c1907d0
(cherry picked from commit 419a6a9079)
 2024-07-31 04:04:47 +00:00
Automerger Merge Worker
867c555ce2 Merge changes from topic "am-ce9d87dcbf8842e1b061384257d591c9" into udc-dev 
* changes:
  [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: 694378b3da -s ours am: 0e02726c4e -s ours
  [automerger skipped] RESTRICT AUTOMERGE Restrict Settings Homepage prior to provisioning am: b66997fc4e -s ours am: c7ee3d1670 -s ours am: 248f8b8d9f -s ours am: 68fd19a9df -s ours am: 9e2eff14db -s ours
 2024-06-24 20:53:01 +00:00
Chris Antol
68c24becb6 [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: 694378b3da -s ours am: 0e02726c4e -s ours 
am skip reason: contains skip directive

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

Change-Id: Ia7438bdd9598a17378f33dd05a6a9b8827af8b62
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-06-24 20:52:51 +00:00
Chris Antol
40cd7fb097 [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: 4b9488fe71 -s ours 
am skip reason: contains skip directive

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

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

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

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

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

Change-Id: I77609cc5de04630570ce57f783343d6c46557c41
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-06-24 20:52:45 +00:00
Automerger Merge Worker
87f2958aa6 Merge changes from topic "am-fcea38898c4040169199454742da1906" into udc-dev 
* changes:
  [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: 6fce978ab9 -s ours
  [automerger skipped] RESTRICT AUTOMERGE Restrict Settings Homepage prior to provisioning am: 2f0db305a6 -s ours am: 46283eeefe -s ours am: 54eb16a0ec -s ours am: 4293259a45 -s ours
 2024-06-24 20:52:42 +00:00
Chris Antol
62a2fae07c [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: 6fce978ab9 -s ours 
am skip reason: contains skip directive

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

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

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

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

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

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

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

Change-Id: I714984cfa379c8f5aeea7aa877b7af4ac4bb0588
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-06-24 20:52:21 +00:00
Chris Antol
0e02726c4e [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: 694378b3da -s ours 
am skip reason: contains skip directive

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

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

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

Change-Id: Ie1cf83aa1934b7a5a9098566b5b9a2cf379dbd75
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-06-24 20:52:11 +00:00
Chris Antol
62e7a84486 [automerger skipped] Merge "RESTRICT AUTOMERGE Restrict Settings Homepage prior to provisioning" into tm-dev am: 477f4f21f0 -s ours am: 63e3d91b32 -s ours am: 822c7c26ee -s ours 
am skip reason: contains skip directive

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

Change-Id: If867c748429bb9c9aa81b97386c5aea5ba3e5b6c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-06-24 20:52:10 +00:00
Chris Antol
5c4fb5b7e5 [automerger skipped] RESTRICT AUTOMERGE Restrict Settings Homepage prior to provisioning am: d83f47397e -s ours am: c909913f89 -s ours am: 1ff5669883 -s ours 
am skip reason: contains skip directive

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

Change-Id: I6bffa0d0f253632dc291785d45f9510598391306
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-06-24 20:52:03 +00:00
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
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
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
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
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 7f1c4df02d is already in history

Original change: https://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 7f1c4df02d is already in history

Original change: https://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
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
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