PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
105,044 Commits 1 Branch 0 Tags
b15e7be2a9bc692228c47c09cca975a43cd1af1c
Commit Graph

105044 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Chris Antol
b15e7be2a9 Merge "Checks cross user permission before handling intent" into tm-dev am: 876787b619 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/29010757

Change-Id: Icdcfdf068f58ae82842d7e5bb05a7ba5adf244d7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-09-05 03:18:14 +00:00
Chris Antol
876787b619 Merge "Checks cross user permission before handling intent" into tm-dev 2024-09-05 03:07:30 +00:00
Treehugger Robot
38d0889de0 Merge "startActivityForResult with new Intent" into sc-dev am: 5e94bcbb1d am: 72e4718e69 am: a1fea68952 am: a6755d0734 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/28761671

Change-Id: I3222988b72efd562f2215217c764962e4eec814a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-09-04 17:00:07 +00:00
Treehugger Robot
a6755d0734 Merge "startActivityForResult with new Intent" into sc-dev am: 5e94bcbb1d am: 72e4718e69 am: a1fea68952 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/28761671

Change-Id: Ie2376064867d72868e5fed092bc04c5412b13449
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-09-04 16:50:02 +00:00
Treehugger Robot
a1fea68952 Merge "startActivityForResult with new Intent" into sc-dev am: 5e94bcbb1d am: 72e4718e69 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/28761671

Change-Id: I9695aa42a1713b803f4cf1b72f5ae308eee62a6b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-09-04 16:38:58 +00:00
Treehugger Robot
72e4718e69 Merge "startActivityForResult with new Intent" into sc-dev am: 5e94bcbb1d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/28761671

Change-Id: Ife0d68f9156a3ff6ffd1f08b2d58bf9741a734f8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-09-04 16:29:04 +00:00
Treehugger Robot
5e94bcbb1d Merge "startActivityForResult with new Intent" into sc-dev 2024-09-04 16:26:10 +00:00
Fan Wu
c24808f9b6 Checks cross user permission before handling intent 
Bug: 326057017

Test: atest

Flag: EXEMPT bug fix
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:d3b3edd45167515579ab156533754e56ac813f35)
Merged-In: I3444e55b22b7487f96b0e3e9deb3f844c4c4723a
Change-Id: I3444e55b22b7487f96b0e3e9deb3f844c4c4723a
 2024-08-29 17:37:49 +00:00
Treehugger Robot
f7ccd80017 [automerger skipped] Merge "RESTRICT AUTOMERGE Stops hiding a11y services with the same package+label as an activity." into sc-dev am: 5d2e307f6e am: 0830cf7fbe -s ours am: 8d6f3c4660 -s ours am: ab7326276b -s ours 
am skip reason: contains skip directive

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

Change-Id: If411381d56f023bd848c0192b22669e66fe99c36
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-08-22 00:55:50 +00:00
Daniel Norman
5f56bce0a2 [automerger skipped] RESTRICT AUTOMERGE Stops hiding a11y services with the same package+label as an activity. am: c4963a73f0 am: 41efccc461 -s ours am: 0044ecdb7d -s ours am: 4583de745f -s ours 
am skip reason: contains skip directive

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

Change-Id: I0a6cb5f3b68ac28de033017f505f37e2c874aa16
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-08-22 00:55:45 +00:00
Treehugger Robot
ab7326276b [automerger skipped] Merge "RESTRICT AUTOMERGE Stops hiding a11y services with the same package+label as an activity." into sc-dev am: 5d2e307f6e am: 0830cf7fbe -s ours am: 8d6f3c4660 -s ours 
am skip reason: contains skip directive

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

Change-Id: Ia56a6a1b9f6e47606a4d67afe685be490ed4238c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-08-22 00:48:22 +00:00
Daniel Norman
4583de745f [automerger skipped] RESTRICT AUTOMERGE Stops hiding a11y services with the same package+label as an activity. am: c4963a73f0 am: 41efccc461 -s ours am: 0044ecdb7d -s ours 
am skip reason: contains skip directive

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

Change-Id: I3882ec6ceedb1551f129707d25fcabd34e10951e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-08-22 00:48:17 +00:00
Treehugger Robot
8d6f3c4660 [automerger skipped] Merge "RESTRICT AUTOMERGE Stops hiding a11y services with the same package+label as an activity." into sc-dev am: 5d2e307f6e am: 0830cf7fbe -s ours 
am skip reason: contains skip directive

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

Change-Id: I0260eb336aa1f9ce0bdb8ff6877f433d9caa3efe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-08-22 00:39:55 +00:00
Daniel Norman
0044ecdb7d [automerger skipped] RESTRICT AUTOMERGE Stops hiding a11y services with the same package+label as an activity. am: c4963a73f0 am: 41efccc461 -s ours 
am skip reason: contains skip directive

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

Change-Id: Iefc2d605f29af788a5ef6e3cb3381c41b621c1b3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-08-22 00:39:51 +00:00
Daniel Norman
f5ed34f494 [automerger skipped] RESTRICT AUTOMERGE Stops hiding a11y services with the same package+label as an activity. am: 1bcc404958 -s ours am: 8024751b9e -s ours 
am skip reason: contains skip directive

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

Change-Id: Ied30a43fcf228c7da92151e163d45ef07ebca961
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-08-22 00:23:01 +00:00
Daniel Norman
8024751b9e [automerger skipped] RESTRICT AUTOMERGE Stops hiding a11y services with the same package+label as an activity. am: 1bcc404958 -s ours 
am skip reason: contains skip directive

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

Change-Id: I95295b46d96f7edbf4ea14911083bbde3c2c2f5c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-08-22 00:16:52 +00:00
Treehugger Robot
0830cf7fbe Merge "RESTRICT AUTOMERGE Stops hiding a11y services with the same package+label as an activity." into sc-dev am: 5d2e307f6e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/28782741

Change-Id: Ia4dbc1a9dfd08e1a210fa047855ec51f972f312f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-08-22 00:16:50 +00:00
Daniel Norman
41efccc461 RESTRICT AUTOMERGE Stops hiding a11y services with the same package+label as an activity. am: c4963a73f0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/28782741

Change-Id: Ibd262d1e500113d0b29fae776cc950610dcc02db
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-08-22 00:16:47 +00:00
Daniel Norman
4139b9fa1e RESTRICT AUTOMERGE Stops hiding a11y services with the same package+label as an activity. am: 398ab19923 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/28806654

Change-Id: I312e63382e673d3f2661dbf0a82e8181c8aaa6b7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-08-22 00:16:07 +00:00
Treehugger Robot
5d2e307f6e Merge "RESTRICT AUTOMERGE Stops hiding a11y services with the same package+label as an activity." into sc-dev 2024-08-22 00:03:59 +00:00
Daniel Norman
398ab19923 RESTRICT AUTOMERGE Stops hiding a11y services with the same package+label as an activity. 
Bug: 353700779
Test: Install poc APKs from the bug, observe issue not reproducible
Test: (automated tests on 'main' branch)
Flag: NONE security fix
Change-Id: Ia8d43229d277dd4442173166ae0402f05096da4b
 2024-08-14 21:18:53 +00:00
Daniel Norman
1bcc404958 RESTRICT AUTOMERGE Stops hiding a11y services with the same package+label as an activity. 
Bug: 353700779
Test: Install poc APKs from the bug, observe issue not reproducible
Test: (automated tests on 'main' branch)
Flag: NONE security fix
Change-Id: Ia8d43229d277dd4442173166ae0402f05096da4b
 2024-08-14 21:17:10 +00:00
Daniel Norman
c4963a73f0 RESTRICT AUTOMERGE Stops hiding a11y services with the same package+label as an activity. 
Bug: 353700779
Test: Install poc APKs from the bug, observe issue not reproducible
Test: (automated tests on 'main' branch)
Flag: NONE security fix
Change-Id: Ia8d43229d277dd4442173166ae0402f05096da4b
 2024-08-14 21:16:34 +00:00
Adam Bookatz
2f53e6ab61 startActivityForResult with new Intent 
Rather than use the raw Intent, we make a copy of it. See bug.

Bug: 330722900
Flag: EXEMPT bugfix
Test: manual
Test: atest com.android.settings.users.UserSettingsTest
            com.android.settings.users.UserDetailsSettingsTest
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:1189e24e47571eae86634aeaa7dc60b8fe7f4820)
Merged-In: Id74e4b7ae261f2916eedaef04a679f83409a4b67
Change-Id: Id74e4b7ae261f2916eedaef04a679f83409a4b67
 2024-08-12 17:19:29 +00:00
Yiling Chuang
c01f668a46 [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: 965ab0d25d -s ours 
am skip reason: contains skip directive

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

Change-Id: Id9d72904a15c4bad3a78169e4e8151306b1ad872
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-08-02 17:30:04 +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
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
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
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
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
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
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
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
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
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
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
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
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
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
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