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

125812 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Daniel Norman
25ecee0563 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:20:10 +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
Treehugger Robot
20002f05cb [automerger skipped] Merge "RESTRICT AUTOMERGE FRP bypass defense in App battery usage page" into tm-qpr-dev am: 0864404279 -s ours am: 59276afaf6 -s ours am: 49709fc079 -s ours 
am skip reason: contains skip directive

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

Change-Id: I655c042f8ecbd8f6516b962b76f44ecda5908088
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-08-03 03:27:43 +00:00
Yiling Chuang
ab8549ec77 [automerger skipped] RESTRICT AUTOMERGE FRP bypass defense in App battery usage page am: 0e903bfe7f -s ours am: 8a7b910ba9 -s ours am: 15cc3710ae -s ours 
am skip reason: contains skip directive

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

Change-Id: I784fceec0fbd1608588469254e8203cff757dbf7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-08-03 03:27:38 +00:00
Treehugger Robot
49709fc079 [automerger skipped] Merge "RESTRICT AUTOMERGE FRP bypass defense in App battery usage page" into tm-qpr-dev am: 0864404279 -s ours am: 59276afaf6 -s ours 
am skip reason: contains skip directive

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

Change-Id: I532ffd0004435cb6fcb1e67696d5c68fb64305f4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-08-03 03:07:43 +00:00
Yiling Chuang
15cc3710ae [automerger skipped] RESTRICT AUTOMERGE FRP bypass defense in App battery usage page am: 0e903bfe7f -s ours am: 8a7b910ba9 -s ours 
am skip reason: contains skip directive

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

Change-Id: I580fce11c253788ac47f04350f10af3318e23ff0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-08-03 03:07:39 +00:00
Treehugger Robot
59276afaf6 [automerger skipped] Merge "RESTRICT AUTOMERGE FRP bypass defense in App battery usage page" into tm-qpr-dev am: 0864404279 -s ours 
am skip reason: contains skip directive

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

Change-Id: Ib8f1275ac530f9b3121ded28f577a2a782db069f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-08-03 02:53:52 +00:00
Yiling Chuang
8a7b910ba9 [automerger skipped] RESTRICT AUTOMERGE FRP bypass defense in App battery usage page am: 0e903bfe7f -s ours 
am skip reason: contains skip directive

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

Change-Id: Ie089a6ac05c7849aeaeb2d42d3852fb426489036
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-08-03 02:53:43 +00:00
Treehugger Robot
0864404279 Merge "RESTRICT AUTOMERGE FRP bypass defense in App battery usage page" into tm-qpr-dev 2024-08-03 02:31:37 +00:00
Treehugger Robot
35914d9093 [automerger skipped] Merge "RESTRICT AUTOMERGE FRP bypass defense in App battery usage page" into udc-dev am: a64d062059 -s ours am: 1161698a24 -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/+/28550766

Change-Id: I6dce63481a96da4be258383ee01d5484769d0985
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-08-03 00:28:05 +00:00
Yiling Chuang
875c5d14d9 [automerger skipped] RESTRICT AUTOMERGE FRP bypass defense in App battery usage page am: 2659f8416c -s ours am: de57075dfa -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/+/28550766

Change-Id: I299d60f3d8f2b5409973129fa65844a47bb10f44
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-08-03 00:28:02 +00:00
Treehugger Robot
1161698a24 [automerger skipped] Merge "RESTRICT AUTOMERGE FRP bypass defense in App battery usage page" into udc-dev am: a64d062059 -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/+/28550766

Change-Id: Idc3b35dc4bf2862d1d83ab01f73f9a1913e77beb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-08-03 00:08:59 +00:00
Yiling Chuang
de57075dfa [automerger skipped] RESTRICT AUTOMERGE FRP bypass defense in App battery usage page am: 2659f8416c -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/+/28550766

Change-Id: Ie7959830aed05d9db14dd99aa414e312c8d0c846
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-08-03 00:08:56 +00:00
Treehugger Robot
a64d062059 Merge "RESTRICT AUTOMERGE FRP bypass defense in App battery usage page" into udc-dev 2024-08-02 23:46:15 +00:00
Yiling Chuang
97892e0e3c [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: 960aed7975 -s ours am: d5dbf7f109 -s ours am: 5af6aa5e74 -s ours am: 125cc26c9d -s ours 
am skip reason: contains skip directive

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

Change-Id: Ib4476ed744d680cdabf11caaac91d41b36bf181c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-08-02 18:32:37 +00:00
Yiling Chuang
0f48478184 [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: c01f668a46 -s ours am: 0893dc73a9 -s ours am: fb7bdc300f -s ours 
am skip reason: contains skip directive

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

Change-Id: I3093f6a716d2b9279c71329d90c88790dd0b6cf3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-08-02 18:31:37 +00:00
Yiling Chuang
125cc26c9d [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: 960aed7975 -s ours am: d5dbf7f109 -s ours am: 5af6aa5e74 -s ours 
am skip reason: contains skip directive

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

Change-Id: Idc4033dd665d34db8e63ed4731bf785ee360e018
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-08-02 18:13:24 +00:00
Yiling Chuang
5af6aa5e74 [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: 960aed7975 -s ours am: d5dbf7f109 -s ours 
am skip reason: contains skip directive

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

Change-Id: I315a2eaffbc45ba88e864224e12df8f3163fcc96
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-08-02 18:12:55 +00:00
Yiling Chuang
fb7bdc300f [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: c01f668a46 -s ours am: 0893dc73a9 -s ours 
am skip reason: contains skip directive

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

Change-Id: I632245ecadf6b37ee472d1bd39c82fef79ebe24a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-08-02 18:12:40 +00:00
Yiling Chuang
8f987c8c6e [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: f2e95596f7 -s ours am: 9c20727621 -s ours am: e1963ea00f -s ours am: 9685539983 -s ours 
am skip reason: contains skip directive

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

Change-Id: Ice19fdb084b873a14bf290f7503eeae3cc16dded
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-08-02 17:43:43 +00:00
Yiling Chuang
e825e8f3c1 [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: 77f4888ead -s ours am: 76c9face76 -s ours am: 89e0e5d5b8 -s ours 
am skip reason: contains skip directive

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

Change-Id: I8a5fb937e980fccb4deb7eed4b8f270e6321b980
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-08-02 17:43:33 +00:00
Yiling Chuang
24dfb4c4df [automerger skipped] RESTRICT AUTOMERGE FRP bypass defense in App battery usage page am: 23b88e0724 am: eae022088f am: 4d263156f8 -s ours am: 89abf5f77e -s ours am: 456e3c0a44 -s ours 
am skip reason: contains skip directive

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

Change-Id: I0ffb7f43a79850d6fda50f7f172776009a480745
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-08-02 17:43:24 +00:00
Yiling Chuang
71697909a8 [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: 32db633219 -s ours am: 5ece21f598 -s ours am: 44a67efd4b -s ours 
am skip reason: contains skip directive

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

Change-Id: I66c438fdea76be84dc22454f80e242e6bd28c879
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-08-02 17:43:15 +00:00
Yiling Chuang
0893dc73a9 [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: c01f668a46 -s ours 
am skip reason: contains skip directive

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

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

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

Change-Id: I505fddf36247494338be3c053c5dff764d479680
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-08-02 17:43:06 +00:00
Yiling Chuang
6e97d9b93c [automerger skipped] RESTRICT AUTOMERGE FRP bypass defense in App battery usage page am: 23b88e0724 am: 5fc9c5c21f -s ours am: 117fb8c534 -s ours am: 596d1cd267 -s ours 
am skip reason: contains skip directive

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

Change-Id: Ifededfca7283d0e9405b02356144c13b191645b8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-08-02 17:42:56 +00:00
Yiling Chuang
d5dbf7f109 [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: 960aed7975 -s ours 
am skip reason: contains skip directive

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

Change-Id: I78f328c64ded810d38f1f650f50d6fe08830f293
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-08-02 17:42:38 +00:00
Yiling Chuang
9685539983 [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: f2e95596f7 -s ours am: 9c20727621 -s ours am: e1963ea00f -s ours 
am skip reason: contains skip directive

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

Change-Id: I49491722fab0e072b9a5dd1f358bde7ff5043f9c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-08-02 17:30:46 +00:00
Yiling Chuang
89e0e5d5b8 [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: 77f4888ead -s ours am: 76c9face76 -s ours 
am skip reason: contains skip directive

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

Change-Id: Ibc166ad9436cad5c03ff78eae97a3bf608f6da94
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-08-02 17:30:36 +00:00
Yiling Chuang
456e3c0a44 [automerger skipped] RESTRICT AUTOMERGE FRP bypass defense in App battery usage page am: 23b88e0724 am: eae022088f am: 4d263156f8 -s ours am: 89abf5f77e -s ours 
am skip reason: contains skip directive

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

Change-Id: Ifc77a76d588cfea7788462caa54ee14cd8245ab1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-08-02 17:30:25 +00:00
Yiling Chuang
e1963ea00f [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: f2e95596f7 -s ours am: 9c20727621 -s ours 
am skip reason: contains skip directive

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

Change-Id: Iccf5a8bbbe71a913922fe342dd01ce1b37395912
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-08-02 17:30:25 +00:00
Yiling Chuang
44a67efd4b [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: 32db633219 -s ours am: 5ece21f598 -s ours 
am skip reason: contains skip directive

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

Change-Id: I4668297c76e3a3e266215989906f808733fc818e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-08-02 17:30:15 +00:00
Yiling Chuang
76c9face76 [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: 77f4888ead -s ours 
am skip reason: contains skip directive

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

Change-Id: I2e556baf726120bb736f0a2400acc354431aad07
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-08-02 17:30:14 +00:00
Yiling Chuang
960aed7975 [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: Iec703cb05500e71270894100da5135a1ab83f31f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-08-02 17:30:08 +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
b292a50a68 [automerger skipped] RESTRICT AUTOMERGE FRP bypass defense in App battery usage page am: c9d2588c69 -s ours am: b3f4ad63ea -s ours am: 7efbf62816 -s ours am: cfea05b4ca -s ours 
am skip reason: contains skip directive

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

Change-Id: I23998459b987982c682dfc8a5735053b85beee8a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-08-02 17:30:02 +00:00
Yiling Chuang
89abf5f77e [automerger skipped] RESTRICT AUTOMERGE FRP bypass defense in App battery usage page am: 23b88e0724 am: eae022088f am: 4d263156f8 -s ours 
am skip reason: contains skip directive

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

Change-Id: I93c7078476a71303f2b5c2087125d9b08b882bab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-08-02 17:30:01 +00:00
Yiling Chuang
596d1cd267 [automerger skipped] RESTRICT AUTOMERGE FRP bypass defense in App battery usage page am: 23b88e0724 am: 5fc9c5c21f -s ours am: 117fb8c534 -s ours 
am skip reason: contains skip directive

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

Change-Id: I6cd6d0810d2b182c016c06d62f8e094aaf0dbd42
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-08-02 17:29:50 +00:00
Yiling Chuang
5ece21f598 [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: 32db633219 -s ours 
am skip reason: contains skip directive

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

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

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

Change-Id: Ief7baf4ddee6a623a009bc73ed9c54143a93e109
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-08-02 17:18:27 +00:00
Yiling Chuang
117fb8c534 [automerger skipped] RESTRICT AUTOMERGE FRP bypass defense in App battery usage page am: 23b88e0724 am: 5fc9c5c21f -s ours 
am skip reason: contains skip directive

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

Change-Id: I6b3bcf611cecbfbd8fef97208372449c95dc2405
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-08-02 17:18:13 +00:00
Yiling Chuang
9c20727621 [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: f2e95596f7 -s ours 
am skip reason: contains skip directive

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

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