Commit Graph

124303 Commits

Author SHA1 Message Date
Treehugger Robot
329fd334c3 [automerger skipped] Merge "Don't let profiles open the UserSettings overflow [DO NOT MERGE]" into sc-qpr1-dev am: 8cfbd8aa9b -s ours am: 24dc9f533a -s ours
am skip reason: contains skip directive

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

Change-Id: Id24190cf6ed3742f08b7ec721565d397eb11985b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-12-03 20:38:36 +00:00
Adam Bookatz
1596e41a75 [automerger skipped] Don't let profiles open the UserSettings overflow [DO NOT MERGE] am: 6f1c499e57 -s ours am: 1a45fcee73 -s ours
am skip reason: contains skip directive

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

Change-Id: I5f08938878d15cd7643146bd5879b65716c3b817
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-12-03 20:38:29 +00:00
Treehugger Robot
157d188e4f [automerger skipped] Merge "Don't let profiles open the UserSettings overflow [DO NOT MERGE]" into tm-dev am: e0e72a57b7 am: 2b8075716b -s ours
am skip reason: Merged-In I5e4c095cda3e19fa5c63c2c550a526f5da8ec5c1 with SHA-1 9882f43d9c is already in history

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

Change-Id: I66801867f8f150d4b06e78ad7d2c95fe2184f9cf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-12-03 20:37:51 +00:00
Adam Bookatz
aa78945af2 [automerger skipped] Don't let profiles open the UserSettings overflow [DO NOT MERGE] am: 31e69deb28 am: 88f8eaecd6 -s ours
am skip reason: Merged-In I5e4c095cda3e19fa5c63c2c550a526f5da8ec5c1 with SHA-1 9882f43d9c is already in history

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

Change-Id: Ic4da3cf7abf3928136a9d365179dd216b02fb61a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-12-03 20:37:47 +00:00
Treehugger Robot
b937941549 Merge "Don't let profiles open the UserSettings overflow [DO NOT MERGE]" into sc-v2-dev 2024-12-03 20:21:34 +00:00
Treehugger Robot
f7d9702392 [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: Ib8f7572d0568fb93d202d4b0bddb9240cd9aa951
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-12-03 20:16:59 +00:00
Adam Bookatz
e08637ef82 [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: I2ee2217d634e0bf32eabd3baefe75b41ac8ea082
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-12-03 20:16:56 +00:00
Treehugger Robot
23621ee8d7 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: I30d38cb18cc432cee02aaf338332cb82394af4bf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-12-03 20:16:45 +00:00
Treehugger Robot
2112cc5ef9 [automerger skipped] Merge "Don't let profiles open the UserSettings overflow [DO NOT MERGE]" into sc-dev am: ead69f3d43 -s ours am: ad1e470fc0 -s ours
am skip reason: contains skip directive

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

Change-Id: Ic50acb869e087908f40a44f2701d1a7c6c7a96d8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-12-03 20:16:44 +00:00
Adam Bookatz
eb1e5320e7 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: I793ddf2e961045cf0da2e569f55fe8cf8da02aed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-12-03 20:16:41 +00:00
Adam Bookatz
d5e5daf68e [automerger skipped] Don't let profiles open the UserSettings overflow [DO NOT MERGE] am: 44a35ac07b -s ours am: 9d81e7d2e5 -s ours
am skip reason: contains skip directive

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

Change-Id: I1a9ae19f5ecee037bbb6e471ce175c1b4a53643e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-12-03 20:16:38 +00:00
Treehugger Robot
24dc9f533a [automerger skipped] Merge "Don't let profiles open the UserSettings overflow [DO NOT MERGE]" into sc-qpr1-dev am: 8cfbd8aa9b -s ours
am skip reason: contains skip directive

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

Change-Id: Ied614224826efe4e3dda2bcc6b4b9b3e8b704905
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-12-03 20:16:18 +00:00
Adam Bookatz
1a45fcee73 [automerger skipped] Don't let profiles open the UserSettings overflow [DO NOT MERGE] am: 6f1c499e57 -s ours
am skip reason: contains skip directive

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

Change-Id: Ic6bdcdeaea0d4e7074f4469281126d33315abc58
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-12-03 20:16:11 +00:00
Treehugger Robot
2b8075716b Merge "Don't let profiles open the UserSettings overflow [DO NOT MERGE]" into tm-dev am: e0e72a57b7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/30490211

Change-Id: Icc114cca75791a256df51901f55242478fb7554c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-12-03 20:16:10 +00:00
Adam Bookatz
88f8eaecd6 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: Ide60dc82191b736ae1d1906d0b6ecd9808c7bc1e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-12-03 20:16:05 +00:00
Treehugger Robot
30d593d55f Merge "Don't let profiles open the UserSettings overflow [DO NOT MERGE]" into tm-dev am: e0e72a57b7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/30490211

Change-Id: Ia080e518c2170904c52fde02403ee63c9b55e8d4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-12-03 20:15:52 +00:00
Treehugger Robot
ad1e470fc0 [automerger skipped] Merge "Don't let profiles open the UserSettings overflow [DO NOT MERGE]" into sc-dev am: ead69f3d43 -s ours
am skip reason: Merged-In I5e4c095cda3e19fa5c63c2c550a526f5da8ec5c1 with SHA-1 6f1c499e57 is already in history

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

Change-Id: I061448f1d049252139864636361c59710659f2ea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-12-03 20:15:42 +00:00
Adam Bookatz
9d81e7d2e5 [automerger skipped] Don't let profiles open the UserSettings overflow [DO NOT MERGE] am: 44a35ac07b -s ours
am skip reason: Merged-In I5e4c095cda3e19fa5c63c2c550a526f5da8ec5c1 with SHA-1 6f1c499e57 is already in history

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

Change-Id: Ic5289feb780f3de57608de58b86d7250da337727
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-12-03 20:15:39 +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
8cfbd8aa9b Merge "Don't let profiles open the UserSettings overflow [DO NOT MERGE]" into sc-qpr1-dev 2024-12-03 19:57:12 +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
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
Treehugger Robot
e0e72a57b7 Merge "Don't let profiles open the UserSettings overflow [DO NOT MERGE]" into tm-dev 2024-12-03 19:45:29 +00:00
Treehugger Robot
ead69f3d43 Merge "Don't let profiles open the UserSettings overflow [DO NOT MERGE]" into sc-dev 2024-12-03 19:31:03 +00:00
Jason Chiu
7415bc1002 [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: Ic0e4ba54f0aa42dc6ea2de25193ae750e40f7576
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-11-25 06:23:23 +00:00
Jason Chiu
dfc96575be [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: Id441681a3b49487fa5042476d43a0b09a34d79bb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-11-25 06:23:16 +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
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
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
276ca29b31 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: Ib6eb79eee294ac76553b9393c29929e091036153
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-11-25 04:30:41 +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
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
44a35ac07b 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:46 +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
6f1c499e57 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:36 +00:00
Adam Bookatz
4901c86b76 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:33 +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
eaefa87f37 [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: I537639af4c9331cf5f901ccfa23dfc91756fd88c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-11-14 00:49:25 +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
108a184888 [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: I7a76ffacc1fb1bffcc28c307f192ca63dee649ba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-11-13 14:38:56 +00:00