Commit Graph

124278 Commits

Author SHA1 Message Date
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
Bill Yi
b7cf038679 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I6ae0fec262e838110a867b3555a61f1d577482af
2024-07-29 15:14:51 -07:00
Treehugger Robot
7c78a90387 Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-mainline-prod 2024-07-23 08:53:37 +00:00
Bill Yi
6ac305bdc5 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I781749a47677cef224c9aa79c1333374a2e86fe8
2024-07-22 21:15:58 -07:00
Bill Yi
6a8dff19ac Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ic7a3ed2076e279e5b23f5f069a95381ca70e0ccb
2024-07-22 21:14:33 -07:00
Treehugger Robot
8e2e6d144a Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-mainline-prod 2024-07-16 17:35:19 +00:00
Bill Yi
9f0d501ae0 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I7bb34378cecb16ddb9f073dc8965808fc18f8b03
2024-07-15 19:16:05 -07:00
Bill Yi
c1ca881be1 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ic36c209805a453537b7de990a9645a1aab79e6d6
2024-07-15 19:14:40 -07:00
Treehugger Robot
1dbe396041 Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-mainline-prod 2024-07-09 19:50:16 +00:00
Bill Yi
ccebfb91db Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I25aed55c2ff602d0c87f5dff1a89f984a568638c
2024-07-07 22:45:39 -07:00
Bill Yi
d769e1a8d7 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I72f168896fd064fc07902b1b651b3c7ea96a1402
2024-07-07 22:44:08 -07:00
Treehugger Robot
ed84843965 Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-mainline-prod 2024-07-03 02:53:31 +00:00
Bill Yi
adb91863c4 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ib378e8f781250b9c4319440483f8e37e1d71acf8
2024-07-01 18:57:41 -07:00
Bill Yi
d141c167f0 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Iac0048ec09af4267bd4041ed2c9f4eb831fd5f9c
2024-07-01 18:56:06 -07:00
Treehugger Robot
d4fe5b213b Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-mainline-prod 2024-06-26 21:17:07 +00:00
Bill Yi
0117f0587d Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I3a4f2a5e07c25e372b93886f284f962b833b6946
2024-06-25 15:20:58 -07:00
Bill Yi
a80e4c070b Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ide9ec08e53c696dba6970cae1ea0600641ae3eb2
2024-06-25 15:19:35 -07:00
Automerger Merge Worker
b9543bc95b 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: I1c78e05d5f166de408161374cdb6742daf60cf33
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-24 20:54:14 +00:00
Chris Antol
8dfba0ca1d [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: Ibf0d40760cfc5613abac2bc172297f8e629d0ca3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-24 20:54:08 +00:00
Chris Antol
160a36de5b [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: I10ce36ffd3436fa17bd3acd478d6399fd5b04725
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-24 20:53:44 +00:00
Chris Antol
76ba8cb3b3 [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: I5c7d7ece1c6b59e681f91fbb046528b1c6f16670
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-24 20:53:40 +00:00
Automerger Merge Worker
b94744475e 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: Iddfdf38c969dc1a1f2ddc69a059c8964a7521912
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-24 20:53:20 +00:00
Chris Antol
416f28c7a0 [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: I560c1714bcaf5efd661defc80028ca6135b98fad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-24 20:53:15 +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
537bfdc768 [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: Ib78395e77174f09eb60e041f740504eeff034e68
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-24 20:52:53 +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
0f2cae569b [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: I2712e633afaa0291640c91a18bf4d6c6655cda61
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
328f5e4828 [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: I0c4de2e387a5afe8e9ab67ff5815a484db410fc5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-24 20:52:37 +00:00
Chris Antol
986e4151bb [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: If7b171a338c9f7c6cdbf8284621847c7c4b90645
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-24 20:52:33 +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
8c7d72ffa7 [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: I054e1767286041cf5ce3c25fa2abf6089117aaa8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-24 20:52:15 +00:00
Chris Antol
9c94f4604e [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: I0ae1f04405ac5fb540684c96e894606b89493625
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-24 20:52:12 +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