Daniel Norman
b2dea8b011
[automerger skipped] RESTRICT AUTOMERGE Stops hiding a11y services with the same package+label as an activity. am: 1bcc404958
-s ours am: 8024751b9e
-s ours am: f5ed34f494
-s ours am: 1d951d8117
-s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/28807000
Change-Id: Id722f2af9226d3539ac538eca9c62e6424c8b3e0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-08-22 00:47:58 +00:00
Daniel Norman
6077ef2525
[automerger skipped] RESTRICT AUTOMERGE Stops hiding a11y services with the same package+label as an activity. am: 398ab19923
am: 4139b9fa1e
-s ours am: 69fbc355c6
-s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/28806654
Change-Id: I52ef3971597c0d8bb6f1af1dde3ec64ee2c8196f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-08-22 00:47:47 +00:00
Treehugger Robot
8d6f3c4660
[automerger skipped] Merge "RESTRICT AUTOMERGE Stops hiding a11y services with the same package+label as an activity." into sc-dev am: 5d2e307f6e
am: 0830cf7fbe
-s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/28782741
Change-Id: I0260eb336aa1f9ce0bdb8ff6877f433d9caa3efe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-08-22 00:39:55 +00:00
Daniel Norman
460b6479b3
[automerger skipped] RESTRICT AUTOMERGE Stops hiding a11y services with the same package+label as an activity. am: 1bcc404958
-s ours am: 8024751b9e
-s ours am: 1dde2be0b7
-s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/28807000
Change-Id: I6f6949dc1d8e93350f3d5518576a122cad6eb589
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-08-22 00:39:54 +00:00
Daniel Norman
1d951d8117
[automerger skipped] RESTRICT AUTOMERGE Stops hiding a11y services with the same package+label as an activity. am: 1bcc404958
-s ours am: 8024751b9e
-s ours am: f5ed34f494
-s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/28807000
Change-Id: I906f0038c387d3062cb1df6dae735130a67723f2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-08-22 00:39:53 +00:00
Daniel Norman
0044ecdb7d
[automerger skipped] RESTRICT AUTOMERGE Stops hiding a11y services with the same package+label as an activity. am: c4963a73f0
am: 41efccc461
-s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/28782741
Change-Id: Iefc2d605f29af788a5ef6e3cb3381c41b621c1b3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-08-22 00:39:51 +00:00
Daniel Norman
69fbc355c6
[automerger skipped] RESTRICT AUTOMERGE Stops hiding a11y services with the same package+label as an activity. am: 398ab19923
am: 4139b9fa1e
-s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/28806654
Change-Id: I3ad3604b76068825ef76f18f2216b69fa2e86ea0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-08-22 00:39:42 +00:00
Daniel Norman
1a28bf00d3
RESTRICT AUTOMERGE Stops hiding a11y services with the same package+label as an activity. am: 398ab19923
am: 51113ad5ef
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/28806654
Change-Id: I8d823e7b82a69e924adcc6559289aeb4f46cce04
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-08-22 00:39:22 +00:00
Daniel Norman
1dde2be0b7
[automerger skipped] RESTRICT AUTOMERGE Stops hiding a11y services with the same package+label as an activity. am: 1bcc404958
-s ours am: 8024751b9e
-s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/28807000
Change-Id: I43be992e04c5a05f4c844464c79ed7f11d3b1e14
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-08-22 00:23:04 +00:00
Daniel Norman
f5ed34f494
[automerger skipped] RESTRICT AUTOMERGE Stops hiding a11y services with the same package+label as an activity. am: 1bcc404958
-s ours am: 8024751b9e
-s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/28807000
Change-Id: Ied30a43fcf228c7da92151e163d45ef07ebca961
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-08-22 00:23:01 +00:00
Daniel Norman
8024751b9e
[automerger skipped] RESTRICT AUTOMERGE Stops hiding a11y services with the same package+label as an activity. am: 1bcc404958
-s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/28807000
Change-Id: I95295b46d96f7edbf4ea14911083bbde3c2c2f5c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-08-22 00:16:52 +00:00
Treehugger Robot
0830cf7fbe
Merge "RESTRICT AUTOMERGE Stops hiding a11y services with the same package+label as an activity." into sc-dev am: 5d2e307f6e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/28782741
Change-Id: Ia4dbc1a9dfd08e1a210fa047855ec51f972f312f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-08-22 00:16:50 +00:00
Daniel Norman
41efccc461
RESTRICT AUTOMERGE Stops hiding a11y services with the same package+label as an activity. am: c4963a73f0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/28782741
Change-Id: Ibd262d1e500113d0b29fae776cc950610dcc02db
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-08-22 00:16:47 +00:00
Daniel Norman
2652cb6236
RESTRICT AUTOMERGE Stops hiding a11y services with the same package+label as an activity. am: 25ecee0563
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/28807176
Change-Id: I0894ff7c5c10128c096a8a9d161b8e53607a7c79
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-08-22 00:16:19 +00:00
Daniel Norman
51113ad5ef
RESTRICT AUTOMERGE Stops hiding a11y services with the same package+label as an activity. am: 398ab19923
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/28806654
Change-Id: I701845d7ff26c82b6dda7894e9597bb8929aaf86
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-08-22 00:16:11 +00:00
Daniel Norman
4139b9fa1e
RESTRICT AUTOMERGE Stops hiding a11y services with the same package+label as an activity. am: 398ab19923
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/28806654
Change-Id: I312e63382e673d3f2661dbf0a82e8181c8aaa6b7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-08-22 00:16:07 +00:00
Treehugger Robot
5d2e307f6e
Merge "RESTRICT AUTOMERGE Stops hiding a11y services with the same package+label as an activity." into sc-dev
2024-08-22 00:03:59 +00:00
Bill Yi
b68b9feb5d
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Idefefe8fee570d59a76c4a05eccb8edb49cac4cb
2024-08-19 15:30:13 -07:00
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
Treehugger Robot
5b58909131
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-mainline-prod
2024-08-13 17:39:32 +00:00
Bill Yi
556af55a3a
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I009202727ca65ba38beba375c7d6a976d9dacf18
2024-08-12 20:45:12 -07:00
Bill Yi
628f7acb6a
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I679f4a32e2bd0cbf4c2d77a6dac53c9addaa6a01
2024-08-12 20:43:39 -07: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
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
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
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 3c2a216bbb
is already in history
Original change: https://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 3c2a216bbb
is already in history
Original change: https://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
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
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
7f7726879f
[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: Ic47367abafe37d3ad0286e23f52e432c4c10a662
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-08-02 18:13:01 +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
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
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
8fc4503e79
[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: Iff886bf4a9eeeb7453f854b59b0faaf80fca59f3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-08-02 17:31:00 +00:00
Yiling Chuang
0551ff91fb
[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: Ib38f08fa5c9a13c01f7448bb5eeda09f53c81ce8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-08-02 17:30:45 +00:00
Yiling Chuang
d4487bb5da
[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: Ia912431bad12ea12b6cd180e9cdb1814906fadd2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-08-02 17:30:36 +00:00
Yiling Chuang
03213200cb
[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: Ic9eb1125bfa1368f18b15fbee4aaea041daf5966
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-08-02 17:30:27 +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
764d27437f
[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: Id062ba8c24f69ddf497eb73edfd3b913744000f3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-08-02 17:30:17 +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
53934236be
[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: Id29c864ef72e416489be04cc34b51b5ace8926a7
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
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