Nikhil Kumar
01b7062b34
Restrict admin status change when DISALLOW_GRANT_ADMIN is present
...
This change addresses a security gap where users with the "DISALLOW_GRANT_ADMIN" restriction could still grant admin privileges to others, potentially undermining supervised user models. We've extended the existing logic to ensure that restricted users cannot grant or receive admin privileges when the DISALLOW_GRANT_ADMIN restriction is in place. This prevents scenarios where supervised users could create new admins to bypass restrictions and factory reset the device.
In addition to the core functionality improvement, significant code refactoring has been done to untangle complex multiple if conditions. The logic for determining when admin status changes are allowed is now clearer and more readable, taking into account both the "current user" (initiating the change) and the "target user" (whose privileges are being modified).
Bug: 357056776
Test: atest UserDetailsSettingsTest and manually verified the user having DISALLOW_GRANT_ADMIN restriction is not allowed to change admin status of any other user.
Flag: android.multiuser.unicorn_mode_refactoring_for_hsum_read_only
Change-Id: If02c9355ee7ce285b5b7bcddae630d716d5bf333
2024-08-05 18:16:33 +00:00
chelseahao
b377b1c0e4
[Audiosharing] Increase click target.
...
Bug: 357012346
Flag: com.android.settingslib.flags.enable_le_audio_qr_code_private_broadcast_sharing
Test: atest
Change-Id: I2ecaf4d3c8c2b249da4b25b6658f1aef3c43209e
2024-08-05 07:15:45 +00:00
Haijie Hong
094e040213
Merge "Remove duplicate "lifecycle.addObserver(this)"" into main
2024-08-05 06:58:35 +00:00
Chaohui Wang
e0f10543c5
Merge "Settings search for Roaming" into main
2024-08-05 06:54:41 +00:00
Yiyi Shen
b068edadf1
Merge "[Audiosharing] Returns BluetoothDevice when fetchConnectedDevicesByGroupId" into main
2024-08-05 06:11:47 +00:00
Haijie Hong
8e7b62c887
Remove duplicate "lifecycle.addObserver(this)"
...
It's already been added in superclass BluetoothDetailsController.
BUG: 343317785
FLAG: EXEMPT simple fix
Test: atest BluetoothDetailsProfilesControllerTest
Test: atest BluetoothDetailsPairOtherControllerTest
Change-Id: I7a9255cea5bb18b29562fa72898356c7a01cd31c
2024-08-05 13:38:00 +08:00
Chaohui Wang
b9db3c5395
Settings search for Roaming
...
Fix: 351740003
Flag: EXEMPT bug fix
Test: manual - search roaming
Change-Id: I260449bdea7dcaae6a2d44c6810cf2638c18d9a4
2024-08-05 12:58:51 +08:00
Treehugger Robot
793253aaf2
Merge "Reduce flaky of BackgroundInstalledAppsPageProviderTest" into main
2024-08-05 03:11:39 +00:00
Chaohui Wang
210529efc4
Reduce flaky of BackgroundInstalledAppsPageProviderTest
...
Bug: 355413226
Flag: EXEMPT test only
Test: atest BackgroundInstalledAppsPageProviderTest
Change-Id: Iede656b7cf34bac82718f0aff12ee28cbaa9d8f8
2024-08-05 10:23:02 +08:00
Chaohui Wang
45aa574b9b
Merge "Show uncheck toggle when wep not supported" into main
2024-08-05 02:02:20 +00:00
Allen Su
bf0b93b104
[ToA] Fix unit test failure
...
Flag: TEST_ONLY
Bug: 328697623
Test: atest TermsOfAddressCategoryControllerTest
Change-Id: Iddbf5b1ca16e455dfa12b9a9a6543d366b62d55e
2024-08-04 17:01:26 +00:00
Treehugger Robot
9ad4ecfad6
Merge "Replace direct usage of update origin by TestModeBuilder.setEnabled() overload" into main
2024-08-03 18:22:25 +00:00
Treehugger Robot
d92dc8f9f3
[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: 20002f05cb -s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/28559210
Change-Id: Ie4ba665fa19666149d8454b8afbc3191653653bd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-08-03 03:46:28 +00:00
Yiling Chuang
8b960a9425
[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: ab8549ec77 -s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/28559210
Change-Id: Id164055876f5dd7b6c89b6c1bf2988393c935d63
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-08-03 03:46:22 +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
95526524a5
[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: 7452a8c4d8 -s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/28559210
Change-Id: I10dca902ea17a6a76ebf4767b27c5c30899bc8ea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-08-03 03:27:28 +00:00
Yiling Chuang
75bfcb6407
[automerger skipped] RESTRICT AUTOMERGE FRP bypass defense in App battery usage page am: 0e903bfe7f -s ours am: 8a7b910ba9 -s ours am: 88bdbd7ac3 -s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/28559210
Change-Id: I22a7a2603fd841bf24095064f0c7a9195b13f865
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-08-03 03:27:24 +00:00
Treehugger Robot
7452a8c4d8
[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: Ic276da7c0a5c7ce0145a0bb5f35e0bb9e97dc0ad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-08-03 03:08:04 +00:00
Yiling Chuang
88bdbd7ac3
[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: I97145b7f99fc455305a74164b9895cfe7542d7ba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-08-03 03:08:01 +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
fa25f4c5df
[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: 35914d9093 -s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/28550766
Change-Id: Ib7eec0f7770c81dd1d55f21b237cd8e37035ec73
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-08-03 00:47:56 +00:00
Yiling Chuang
86590398fb
[automerger skipped] RESTRICT AUTOMERGE FRP bypass defense in App battery usage page am: 2659f8416c -s ours am: de57075dfa -s ours am: 875c5d14d9 -s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/28550766
Change-Id: If5edeff0961944d2f5e4d2ac55b75a909c308a24
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-08-03 00:47:51 +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 3c2a216bbbhttps://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 3c2a216bbbhttps://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
dad56ace6e
[automerger skipped] Merge "RESTRICT AUTOMERGE FRP bypass defense in App battery usage page" into udc-dev am: a64d062059 -s ours am: ab8f32b8ea -s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/28550766
Change-Id: Ief7b7524d0ad8e997ee5406347382bdd55003d25
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-08-03 00:27:56 +00:00
Yiling Chuang
1fea3dcb65
[automerger skipped] RESTRICT AUTOMERGE FRP bypass defense in App battery usage page am: 2659f8416c -s ours am: cb9e0a3407 -s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/28550766
Change-Id: I09222aadc22ae53129651e43aad5c8f55407b901
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-08-03 00:27:49 +00:00
Treehugger Robot
ab8f32b8ea
[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 3c2a216bbbhttps://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/28550766
Change-Id: I4667ce56ac1683a4a810ce1f792c2bb34073c68b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-08-03 00:09:18 +00:00
Yiling Chuang
cb9e0a3407
[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 3c2a216bbbhttps://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/28550766
Change-Id: I958b17d4d2c81c5c161791f016a064d103525bf6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-08-03 00:09:16 +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 3c2a216bbbhttps://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 3c2a216bbbhttps://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
d962006c70
[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: 97892e0e3c -s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/28550905
Change-Id: I230c2d2530ed570543c3b864311f506db54e9a2f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-08-02 18:49:24 +00:00
Yiling Chuang
97c4456544
[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: 0f48478184 -s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/28550905
Change-Id: Id1c6d53e7ba53a600cd7bdbfff48f4b64be997a3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-08-02 18:48:09 +00:00
Yiling Chuang
58d851863c
[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: 628eb100ba -s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/28550905
Change-Id: I2a22af05115bb52efb86f680d985d2b8b76a3120
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-08-02 18:32:43 +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
522c0f312a
[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: 7f7726879f -s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/28550905
Change-Id: I5d6e39e1016a532b6ce39dc2d2d1b6a6cbd2d18c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-08-02 18:30:53 +00:00
Yiling Chuang
c7b988acd5
[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: 8f987c8c6e -s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/28559202
Change-Id: I346166a0d15ccd7ecc8d2d04c54d1be9a6443e92
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-08-02 18:14:32 +00:00
Yiling Chuang
bbafadcc59
[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: e825e8f3c1 -s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/28550762
Change-Id: I95725d80d6831a02f245167dad4a4df343b910c6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-08-02 18:14:19 +00:00
Yiling Chuang
8359b58ce6
[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: 24dfb4c4df -s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/28550763
Change-Id: Id46663707fdcf255374b1959bf7739de2ef5dd0a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-08-02 18:14:06 +00:00
Yiling Chuang
628eb100ba
[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: Ibe561738a39d4d7ad4c0962986e241790db06053
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-08-02 18:14:04 +00:00
Yiling Chuang
99255dbdaa
[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: 71697909a8 -s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/28559202
Change-Id: I43327b84b60f063b823ea0b15da6425d76603f3e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-08-02 18:13:42 +00:00
Yiling Chuang
c97766ffdf
[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: d53dda5b16 -s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/28550762
Change-Id: I9c1880386268f45421d97ef881599425c7642458
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-08-02 18:13:27 +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
4ab6c61b76
[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: 6e97d9b93c -s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/28550763
Change-Id: Ic466083f1c65e0d87c1938ca7506da8c0afb681b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-08-02 18:13:11 +00:00
