PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
125,197 Commits 1 Branch 0 Tags
6ccef63fce886c3087d8e6599a090f50b554d3d1
Commit Graph

125197 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Yiling Chuang
6ccef63fce 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:38:39 +00:00
Automerger Merge Worker
a9feb359fb [automerger skipped] Merge changes from topic "am-ce9d87dcbf8842e1b061384257d591c9" into udc-dev am: 867c555ce2 -s ours am: ad31e0b966 -s ours 
am skip reason: Merged-In I8cbe38109ebf88a0f68f3917e95468a81c6463c1 with SHA-1 2f0db305a6 is already in history

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

Change-Id: I391770ddec007a39e01126e6aa47f84ea7814e86
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-06-24 21:09:15 +00:00
Chris Antol
a5ca471ced [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: 68c24becb6 -s ours am: a2532a531a -s ours 
am skip reason: contains skip directive

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

Change-Id: If8ef705d36779514a11effc050d20b7076b2211c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-06-24 21:09:11 +00:00
Chris Antol
095f81b067 [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: 40cd7fb097 -s ours am: 664b99002b -s ours 
am skip reason: contains skip directive

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

Change-Id: I6ca4a44d69cf1238ba0a9383c368cf09ab5c46d6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-06-24 21:08:53 +00:00
Chris Antol
f6952b2253 [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: 2f7c96eb1b -s ours am: 7f52694f16 -s ours 
am skip reason: contains skip directive

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

Change-Id: I9e3264da35ac1843921bddaba1f6be472083de2b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-06-24 21:08:49 +00:00
Automerger Merge Worker
2c67b3834c [automerger skipped] Merge changes from topic "am-fcea38898c4040169199454742da1906" into udc-dev am: 87f2958aa6 -s ours am: 94e3511650 -s ours 
am skip reason: Merged-In I8cbe38109ebf88a0f68f3917e95468a81c6463c1 with SHA-1 2f0db305a6 is already in history

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

Change-Id: I771ce6878b29f30154220a2bfb72d647578b9138
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-06-24 21:08:38 +00:00
Chris Antol
06a2d06948 [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: 62a2fae07c -s ours am: 9e499d615c -s ours 
am skip reason: contains skip directive

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

Change-Id: Ifd28163f59f07120dbe24b183f828725347a3037
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-06-24 21:08:35 +00:00
Chris Antol
32e3f4c000 [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: 7a00bca567 -s ours am: 0dabe1aef2 -s ours 
am skip reason: contains skip directive

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

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

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

Change-Id: I3ae3ee868e97abcd5412c071ab1d65296c6fed13
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-06-24 21:08:13 +00:00
Chris Antol
86f8f8f00c [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: 62e7a84486 -s ours am: 39c3f50de1 -s ours 
am skip reason: contains skip directive

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

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

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

Change-Id: Ia39098b1d96c09f1eb333432195a5b6c2c604a60
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-06-24 21:07:58 +00:00
Chris Antol
17946789f0 [automerger skipped] Merge "RESTRICT AUTOMERGE Restrict Settings Homepage prior to provisioning" into tm-dev am: 477f4f21f0 -s ours am: de606472d0 -s ours am: 697b9a5bd7 -s ours am: 9e02caf4d0 -s ours 
am skip reason: contains skip directive

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

Change-Id: Ic0567b10bf6ebcdbcfdc0adda41090bf29674097
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-06-24 21:07:46 +00:00
Chris Antol
b4a06997e4 [automerger skipped] RESTRICT AUTOMERGE Restrict Settings Homepage prior to provisioning am: d83f47397e -s ours am: 964534a7bb -s ours am: 3f9075453e -s ours am: b57c17e1de -s ours 
am skip reason: contains skip directive

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

Change-Id: I5b8b80c7491e98d42815cd98cf4be41736c86519
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-06-24 21:07:42 +00:00
Automerger Merge Worker
ad31e0b966 Merge changes from topic "am-ce9d87dcbf8842e1b061384257d591c9" into udc-dev am: 867c555ce2 -s ours 
am skip reason: Merged-In I8cbe38109ebf88a0f68f3917e95468a81c6463c1 with SHA-1 2f0db305a6 is already in history

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

Change-Id: I71797d8bc0864ef2fc79aca1b32603088d82496d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-06-24 20:58:29 +00:00
Chris Antol
a2532a531a [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: 68c24becb6 -s ours 
am skip reason: contains skip directive

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

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

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

Change-Id: Ia5ca7b92b657110ebc1e49d6aa9ff17da440e31f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-06-24 20:58:08 +00:00
Chris Antol
7f52694f16 [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: 2f7c96eb1b -s ours 
am skip reason: contains skip directive

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

Change-Id: I4ac5fd3108349d7e53235f691a7edb222c01c7a5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-06-24 20:58:05 +00:00
Automerger Merge Worker
94e3511650 Merge changes from topic "am-fcea38898c4040169199454742da1906" into udc-dev am: 87f2958aa6 -s ours 
am skip reason: Merged-In I8cbe38109ebf88a0f68f3917e95468a81c6463c1 with SHA-1 2f0db305a6 is already in history

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

Change-Id: I2f9b219368bb216d28c6bd9ae840aebb3fbb4e45
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-06-24 20:57:53 +00:00
Chris Antol
9e499d615c [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: 62a2fae07c -s ours 
am skip reason: contains skip directive

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

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

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

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

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

Change-Id: Ib6586e4d275d33d32463bb99dc62a2edd5a2f0b1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-06-24 20:57:23 +00:00
Chris Antol
39c3f50de1 [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: 62e7a84486 -s ours 
am skip reason: contains skip directive

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

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

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

Change-Id: I72fbd95fee64d3baee061caeda1fa9b0be39066d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-06-24 20:57:04 +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
9e02caf4d0 [automerger skipped] Merge "RESTRICT AUTOMERGE Restrict Settings Homepage prior to provisioning" into tm-dev am: 477f4f21f0 -s ours am: de606472d0 -s ours am: 697b9a5bd7 -s ours 
am skip reason: contains skip directive

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

Change-Id: I9036463d8f769f516e6bdc2b332cad38371f48b0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-06-24 20:52:02 +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
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