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

125580 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Adam Bookatz
c9ccb17b7d [automerger skipped] Don't let profiles open the UserSettings overflow [DO NOT MERGE] am: 31e69deb28 am: 39011f67c4 -s ours am: ce282b133f -s ours am: b27f623acc -s ours 
am skip reason: contains skip directive

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

Change-Id: Ia13ada3936a8d44688f4f9c927ba93e4b0be08ec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-12-03 21:40:26 +00:00
Adam Bookatz
b27f623acc [automerger skipped] Don't let profiles open the UserSettings overflow [DO NOT MERGE] am: 31e69deb28 am: 39011f67c4 -s ours am: ce282b133f -s ours 
am skip reason: contains skip directive

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

Change-Id: Ie73c0dba1dc75919124507639ba9533f63449fb2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-12-03 21:03:48 +00:00
Treehugger Robot
fc6c9000f2 [automerger skipped] Merge "Don't let profiles open the UserSettings overflow [DO NOT MERGE]" into tm-qpr-dev am: f07deaf5b4 -s ours am: e716dcdb41 -s ours am: 168447a4d1 -s ours 
am skip reason: contains skip directive

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

Change-Id: Ib9210dda165d949c13f540b52df336793f85ca9f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-12-03 20:39:33 +00:00
Adam Bookatz
5ae1733738 [automerger skipped] Don't let profiles open the UserSettings overflow [DO NOT MERGE] am: 9882f43d9c -s ours am: 662804b142 -s ours am: 233da90ddd -s ours 
am skip reason: contains skip directive

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

Change-Id: I18671fcc7fc245b82a9b2f6da0f66977e598aff0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-12-03 20:39:29 +00:00
Treehugger Robot
c05527c1fe [automerger skipped] Merge "Don't let profiles open the UserSettings overflow [DO NOT MERGE]" into udc-dev am: 31af2ff68c am: 00bc2566b2 -s ours 
am skip reason: Merged-In I5e4c095cda3e19fa5c63c2c550a526f5da8ec5c1 with SHA-1 a2f5c08370 is already in history

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

Change-Id: I5c5cc671aea82f5878031928ae9a2570a221c331
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-12-03 20:39:18 +00:00
Adam Bookatz
7ac148bf27 [automerger skipped] Don't let profiles open the UserSettings overflow [DO NOT MERGE] am: 6e413c4cff am: 22fe77ca00 -s ours 
am skip reason: Merged-In I5e4c095cda3e19fa5c63c2c550a526f5da8ec5c1 with SHA-1 a2f5c08370 is already in history

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

Change-Id: I7db5d19a559e3240b0bfbbffe896064b3dd56f7f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-12-03 20:39:14 +00:00
Adam Bookatz
ce282b133f [automerger skipped] Don't let profiles open the UserSettings overflow [DO NOT MERGE] am: 31e69deb28 am: 39011f67c4 -s ours 
am skip reason: contains skip directive

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

Change-Id: Ib9f2c8e53f359470546344aebd9ee6f482eff4b8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-12-03 20:39:06 +00:00
Treehugger Robot
168447a4d1 [automerger skipped] Merge "Don't let profiles open the UserSettings overflow [DO NOT MERGE]" into tm-qpr-dev am: f07deaf5b4 -s ours am: e716dcdb41 -s ours 
am skip reason: contains skip directive

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

Change-Id: I8a90cf6f4f1191ec7f4c6fb82756f50513d089a2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-12-03 20:26:23 +00:00
Adam Bookatz
233da90ddd [automerger skipped] Don't let profiles open the UserSettings overflow [DO NOT MERGE] am: 9882f43d9c -s ours am: 662804b142 -s ours 
am skip reason: contains skip directive

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

Change-Id: I0e31735acbe6d5934aad1351281f75d4284733a4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-12-03 20:26:18 +00:00
Adam Bookatz
39011f67c4 Don't let profiles open the UserSettings overflow [DO NOT MERGE] am: 31e69deb28 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/30490211

Change-Id: Iaa3e5c9dc2b5d0f677391e0b56c0c905cb553118
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-12-03 20:15:37 +00:00
Treehugger Robot
e716dcdb41 [automerger skipped] Merge "Don't let profiles open the UserSettings overflow [DO NOT MERGE]" into tm-qpr-dev am: f07deaf5b4 -s ours 
am skip reason: contains skip directive

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

Change-Id: If436584157bac594504bc26ff60373850b9468d6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-12-03 20:15:13 +00:00
Adam Bookatz
662804b142 [automerger skipped] Don't let profiles open the UserSettings overflow [DO NOT MERGE] am: 9882f43d9c -s ours 
am skip reason: contains skip directive

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

Change-Id: I738257055d7155884ff8524f46d1edb25dda1dfc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-12-03 20:15:08 +00:00
Treehugger Robot
00bc2566b2 Merge "Don't let profiles open the UserSettings overflow [DO NOT MERGE]" into udc-dev am: 31af2ff68c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/30489978

Change-Id: I24391d248a2af734c39f1a9aa5ece22203bdb23c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-12-03 20:15:03 +00:00
Adam Bookatz
22fe77ca00 Don't let profiles open the UserSettings overflow [DO NOT MERGE] am: 6e413c4cff 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/30489978

Change-Id: Ic8113dd1061984e51174b779f6d6e74dfc2a091a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-12-03 20:14:59 +00:00
Treehugger Robot
31af2ff68c Merge "Don't let profiles open the UserSettings overflow [DO NOT MERGE]" into udc-dev 2024-12-03 19:52:15 +00:00
Treehugger Robot
ed4d949e5a Merge "Don't let profiles open the UserSettings overflow [DO NOT MERGE]" into udc-qpr-dev 2024-12-03 19:51:15 +00:00
Treehugger Robot
f07deaf5b4 Merge "Don't let profiles open the UserSettings overflow [DO NOT MERGE]" into tm-qpr-dev 2024-12-03 19:51:15 +00:00
Jason Chiu
30427fa945 [automerger skipped] Block the content scheme intent in AccountTypePreferenceLoader am: d782f9c4bc am: 13b1a03e27 am: f45744f85b am: eff2f8b3e3 am: 0f1943ce36 -s ours am: 83b6988187 -s ours am: 00a94388c6 -s ours am: 197f7ec759 -s ours 
am skip reason: Merged-In Ica87087341cc983df04190919e33dc369fa18619 with SHA-1 8fa1dcb034 is already in history

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

Change-Id: I0e95b53f6acbe9d1449428fbe5c443f53afcf124
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-11-25 06:46:19 +00:00
Jason Chiu
182838b0b4 [automerger skipped] Block the content scheme intent in AccountTypePreferenceLoader am: d782f9c4bc am: 13b1a03e27 am: f45744f85b am: eff2f8b3e3 am: 165151052c -s ours am: 57ad521d75 -s ours am: 24c6f0b462 -s ours 
am skip reason: Merged-In Ica87087341cc983df04190919e33dc369fa18619 with SHA-1 8fa1dcb034 is already in history

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

Change-Id: Id19b6867f67c1e222e865e595a485c701f1f1050
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-11-25 06:46:10 +00:00
Jason Chiu
197f7ec759 [automerger skipped] Block the content scheme intent in AccountTypePreferenceLoader am: d782f9c4bc am: 13b1a03e27 am: f45744f85b am: eff2f8b3e3 am: 0f1943ce36 -s ours am: 83b6988187 -s ours am: 00a94388c6 -s ours 
am skip reason: Merged-In Ica87087341cc983df04190919e33dc369fa18619 with SHA-1 8fa1dcb034 is already in history

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

Change-Id: Ie14bab8d62811188828d789502e2067ea8ff8d9f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-11-25 06:33:47 +00:00
Jason Chiu
00a94388c6 [automerger skipped] Block the content scheme intent in AccountTypePreferenceLoader am: d782f9c4bc am: 13b1a03e27 am: f45744f85b am: eff2f8b3e3 am: 0f1943ce36 -s ours am: 83b6988187 -s ours 
am skip reason: Merged-In Ica87087341cc983df04190919e33dc369fa18619 with SHA-1 8fa1dcb034 is already in history

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

Change-Id: I9eaacde8916a015d88f10fb0356fe29c22d53b8f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-11-25 06:22:09 +00:00
Jason Chiu
24c6f0b462 [automerger skipped] Block the content scheme intent in AccountTypePreferenceLoader am: d782f9c4bc am: 13b1a03e27 am: f45744f85b am: eff2f8b3e3 am: 165151052c -s ours am: 57ad521d75 -s ours 
am skip reason: Merged-In Ica87087341cc983df04190919e33dc369fa18619 with SHA-1 8fa1dcb034 is already in history

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

Change-Id: Iba1806e239cc2d0d8eb2fa313688b47a026f386d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-11-25 06:21:44 +00:00
Jason Chiu
57ad521d75 [automerger skipped] Block the content scheme intent in AccountTypePreferenceLoader am: d782f9c4bc am: 13b1a03e27 am: f45744f85b am: eff2f8b3e3 am: 165151052c -s ours 
am skip reason: Merged-In Ica87087341cc983df04190919e33dc369fa18619 with SHA-1 8fa1dcb034 is already in history

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

Change-Id: I08ddcbd24f4503a411e0189a863b559883452b9c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-11-25 05:51:04 +00:00
Jason Chiu
83b6988187 [automerger skipped] Block the content scheme intent in AccountTypePreferenceLoader am: d782f9c4bc am: 13b1a03e27 am: f45744f85b am: eff2f8b3e3 am: 0f1943ce36 -s ours 
am skip reason: Merged-In Ica87087341cc983df04190919e33dc369fa18619 with SHA-1 8fa1dcb034 is already in history

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

Change-Id: If3217482ab16a3ea4ec93e9370784abf0fa30954
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-11-25 05:49:59 +00:00
Jason Chiu
0f1943ce36 Block the content scheme intent in AccountTypePreferenceLoader am: d782f9c4bc am: 13b1a03e27 am: f45744f85b am: eff2f8b3e3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/30469372

Change-Id: Ifd455d7dc5d6eb5834ad0437bb06d02459a95942
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-11-25 05:26:40 +00:00
Jason Chiu
165151052c Block the content scheme intent in AccountTypePreferenceLoader am: d782f9c4bc am: 13b1a03e27 am: f45744f85b am: eff2f8b3e3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/30469372

Change-Id: I2d0b238f370336a83096683e8e92d8b03007333b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-11-25 05:26:25 +00:00
Jason Chiu
cb3a9b722d Block the content scheme intent in AccountTypePreferenceLoader am: 8fa1dcb034 am: b5bf33ab76 am: 26e1224ea6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/30469374

Change-Id: I5bc99dfe4750532359151f4fadda26567828ad90
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-11-25 05:04:07 +00:00
Jason Chiu
eff2f8b3e3 Block the content scheme intent in AccountTypePreferenceLoader am: d782f9c4bc am: 13b1a03e27 am: f45744f85b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/30469372

Change-Id: Iae3f56de305617331d23ff759618eb2f065048be
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-11-25 05:03:31 +00:00
Jason Chiu
f45744f85b Block the content scheme intent in AccountTypePreferenceLoader am: d782f9c4bc am: 13b1a03e27 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/30469372

Change-Id: I2a1c33211ac87f310e95a066a9d2000773a75b72
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-11-25 04:29:49 +00:00
Jason Chiu
26e1224ea6 Block the content scheme intent in AccountTypePreferenceLoader am: 8fa1dcb034 am: b5bf33ab76 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/30469374

Change-Id: I403257d71d74f78cc7166af1c2f940200599b953
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-11-25 04:29:32 +00:00
Jason Chiu
13b1a03e27 Block the content scheme intent in AccountTypePreferenceLoader am: d782f9c4bc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/30469372

Change-Id: Ica809bd3cb36961d20c5fd0f8dd035f6f7169a35
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-11-25 04:05:17 +00:00
Jason Chiu
b5bf33ab76 Block the content scheme intent in AccountTypePreferenceLoader am: 8fa1dcb034 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/30469374

Change-Id: Ibc5350fee27a89cdf02d82d24bf4834931de4c49
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-11-25 04:04:39 +00:00
Adam Bookatz
31e69deb28 Don't let profiles open the UserSettings overflow [DO NOT MERGE] 
Really, profiles aren't expected to open Settings at all. But if they
do somehow, the overflow shouldn't appear.

Bug: 352542820
Flag: EXEMPT bugfix
Test: Try to access the overflow of the work profile by launching its Settings in
adb shell am start --user 10 'com.android.settings/.Settings\$UserSettingsActivity'

Change-Id: I5e4c095cda3e19fa5c63c2c550a526f5da8ec5c1
Merged-In: I5e4c095cda3e19fa5c63c2c550a526f5da8ec5c1
(cherry picked from commit 69c7f5dac5)
 2024-11-19 19:27:43 +00:00
Adam Bookatz
6e413c4cff Don't let profiles open the UserSettings overflow [DO NOT MERGE] 
Really, profiles aren't expected to open Settings at all. But if they
do somehow, the overflow shouldn't appear.

Bug: 352542820
Flag: EXEMPT bugfix
Test: Try to access the overflow of the work profile by launching its Settings in
adb shell am start --user 10 'com.android.settings/.Settings\$UserSettingsActivity'

Change-Id: I5e4c095cda3e19fa5c63c2c550a526f5da8ec5c1
Merged-In: I5e4c095cda3e19fa5c63c2c550a526f5da8ec5c1
(cherry picked from commit 69c7f5dac5)
 2024-11-19 19:27:40 +00:00
Adam Bookatz
a2f5c08370 Don't let profiles open the UserSettings overflow [DO NOT MERGE] 
Really, profiles aren't expected to open Settings at all. But if they
do somehow, the overflow shouldn't appear.

Bug: 352542820
Flag: EXEMPT bugfix
Test: Try to access the overflow of the work profile by launching its Settings in
adb shell am start --user 10 'com.android.settings/.Settings\$UserSettingsActivity'

Change-Id: I5e4c095cda3e19fa5c63c2c550a526f5da8ec5c1
Merged-In: I5e4c095cda3e19fa5c63c2c550a526f5da8ec5c1
(cherry picked from commit 69c7f5dac5)
 2024-11-19 19:27:30 +00:00
Adam Bookatz
9882f43d9c Don't let profiles open the UserSettings overflow [DO NOT MERGE] 
Really, profiles aren't expected to open Settings at all. But if they
do somehow, the overflow shouldn't appear.

Bug: 352542820
Flag: EXEMPT bugfix
Test: Try to access the overflow of the work profile by launching its Settings in
adb shell am start --user 10 'com.android.settings/.Settings\$UserSettingsActivity'

Change-Id: I5e4c095cda3e19fa5c63c2c550a526f5da8ec5c1
Merged-In: I5e4c095cda3e19fa5c63c2c550a526f5da8ec5c1
(cherry picked from commit 69c7f5dac5)
 2024-11-19 19:27:27 +00:00
Jason Chiu
8fa1dcb034 Block the content scheme intent in AccountTypePreferenceLoader 
Bug: 366401629
Flag: EXEMPT security fix
Test: atest AccountTypePreferenceLoaderTest, manual
Change-Id: Ica87087341cc983df04190919e33dc369fa18619
Merged-In: Ica87087341cc983df04190919e33dc369fa18619
(cherry picked from commit 841fb3846b)
 2024-11-19 10:47:06 +00:00
Jason Chiu
d782f9c4bc Block the content scheme intent in AccountTypePreferenceLoader 
Also prevent intent defined in AccountPreference from leaking access

Bug: 366401629
Flag: EXEMPT security fix
Test: atest AccountTypePreferenceLoaderTest, manual
Change-Id: Ica87087341cc983df04190919e33dc369fa18619
Merged-In: Ica87087341cc983df04190919e33dc369fa18619
(cherry picked from commit 841fb3846b)
 2024-11-19 10:45:58 +00:00
Bill Yi
3b34ea671e [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 56de354bdb -s ours am: 9e6155da79 -s ours am: 13bc12e33a -s ours 
am skip reason: contains skip directive

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

Change-Id: If5c65e9f66b3dd4e6d0b9e4968a4d075f1c266f6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-11-14 01:11:54 +00:00
Bill Yi
13bc12e33a [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 56de354bdb -s ours am: 9e6155da79 -s ours 
am skip reason: contains skip directive

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

Change-Id: I122a4c7b7656fdd9468e65166f32cf695129c620
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-11-14 00:47:44 +00:00
Bill Yi
9e6155da79 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 56de354bdb -s ours 
am skip reason: contains skip directive

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

Change-Id: I159af6766d0fbf51263b7453a1f2ab749410277d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-11-14 00:25:02 +00:00
Bill Yi
56de354bdb Import translations. DO NOT MERGE ANYWHERE 
BUG:377687053

Auto-generated-cl: translation import
Change-Id: I05db00761923bf98f069ef14f4b89a56c8a812dc
 2024-11-13 22:43:37 +00:00
YK Hung
4426362dca [automerger skipped] Merge "RESTRICT AUTOMERGE Add battery replacement strings" into tm-qpr-dev am: 5a5550e4e5 -s ours am: 2901d2948e -s ours am: e0493334ee -s ours 
am skip reason: contains skip directive

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

Change-Id: Id35aa44c6c437756a1b6e4bc77962667953f1346
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-11-13 15:11:47 +00:00
Jay Wang
11558bd4b9 [automerger skipped] RESTRICT AUTOMERGE Add battery replacement strings am: 9a91334dc9 -s ours am: 954a3bd85a -s ours am: 1d6753e339 -s ours 
am skip reason: contains skip directive

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

Change-Id: I2ca5dc3467ad397a2902df33da71588746e51a2e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-11-13 15:11:41 +00:00
YK Hung
e0493334ee [automerger skipped] Merge "RESTRICT AUTOMERGE Add battery replacement strings" into tm-qpr-dev am: 5a5550e4e5 -s ours am: 2901d2948e -s ours 
am skip reason: contains skip directive

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

Change-Id: I982c0bdddb664eb11ba57a757f48167794a0a8cd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-11-13 14:37:19 +00:00
Jay Wang
1d6753e339 [automerger skipped] RESTRICT AUTOMERGE Add battery replacement strings am: 9a91334dc9 -s ours am: 954a3bd85a -s ours 
am skip reason: contains skip directive

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

Change-Id: I3539bf908be2a2524989d486407a7ecccfaf730b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-11-13 14:37:13 +00:00
YK Hung
2901d2948e [automerger skipped] Merge "RESTRICT AUTOMERGE Add battery replacement strings" into tm-qpr-dev am: 5a5550e4e5 -s ours 
am skip reason: contains skip directive

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

Change-Id: Icbb954270e7c17821ec59a147a66d1d7f8a06d25
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-11-13 14:16:22 +00:00
Jay Wang
954a3bd85a [automerger skipped] RESTRICT AUTOMERGE Add battery replacement strings am: 9a91334dc9 -s ours 
am skip reason: contains skip directive

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

Change-Id: I4e528f792bc6b94934d0d35e5a8d8de4fe846f2d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-11-13 14:16:12 +00:00
YK Hung
5a5550e4e5 Merge "RESTRICT AUTOMERGE Add battery replacement strings" into tm-qpr-dev 2024-11-13 13:57:53 +00:00
Jay Wang
9a91334dc9 RESTRICT AUTOMERGE Add battery replacement strings 
Bug: 376148038
Test: local test
Change-Id: I9d734e4c08da50fd018c512f767ad0432a175b86
 2024-11-13 03:19:12 +00:00