Treehugger Robot
036bf7ec0a
[automerger skipped] Merge "DO NOT MERGE: Prevent non-system IME from becoming device admin" into sc-dev am: 9fa4b1e0a6 am: 3c039ca648 -s ours am: 2df32f537f -s ours am: 4e7bbcce82 -s ours am: c36d4dd62b -s ours am: 26c8ebc082 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23545222
Change-Id: I2994c0b1e8b97d50953d15117475724140b8574e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-12 12:01:51 +00:00
Taran Singh
5d5c3516e6
[automerger skipped] DO NOT MERGE: Prevent non-system IME from becoming device admin am: cb2b753094 am: c362ee7dc2 -s ours am: a9488a71bc -s ours am: ab11731a5b -s ours am: cd7282da37 -s ours am: e199ee1b47 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23545222
Change-Id: I54be4a31a9b623cea193a241d5f2a3d8bd70e02a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-12 12:01:49 +00:00
Treehugger Robot
df0234a563
[automerger skipped] Merge "DO NOT MERGE: Prevent non-system IME from becoming device admin" into sc-v2-dev am: 376bf07767 -s ours am: 30ea3d3cec -s ours am: 38280de428 -s ours am: 3daa00eee5 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23605760
Change-Id: Ic4fc429edf928ddc2d2087e910ad4472d90c3348
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-12 12:01:40 +00:00
Taran Singh
fc49acca28
[automerger skipped] DO NOT MERGE: Prevent non-system IME from becoming device admin am: 76b536abc8 -s ours am: 76f3f2efe8 -s ours am: e11d0e8502 -s ours am: 6c693471db -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23605760
Change-Id: I2b231bee698b171774c92c7703b4e5ef67d86d2e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-12 12:01:38 +00:00
Treehugger Robot
74b860fbf2
[automerger skipped] Merge "DO NOT MERGE: Prevent non-system IME from becoming device admin" into sc-v2-dev am: 376bf07767 -s ours am: 30ea3d3cec -s ours am: 38280de428 -s ours am: 3daa00eee5 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23605760
Change-Id: I3401719a1699dada85ee4fb1c5ac9dc6c91b4cbb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-12 12:01:29 +00:00
Taran Singh
9e5320fd85
[automerger skipped] DO NOT MERGE: Prevent non-system IME from becoming device admin am: 76b536abc8 -s ours am: 76f3f2efe8 -s ours am: e11d0e8502 -s ours am: 6c693471db -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23605760
Change-Id: I11aad288cd53a47fcd2fc7343c544eb23e47e1bf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-12 12:01:26 +00:00
Treehugger Robot
1b1009d355
[automerger skipped] Merge "DO NOT MERGE: Prevent non-system IME from becoming device admin" into sc-qpr1-dev am: e5f9ab14ce -s ours am: 2c62993aca -s ours am: 71bf0d7467 -s ours am: 66539a3cda -s ours am: c60277f91e -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23605250
Change-Id: I795c297f8158fae2ba0d54e43ab28dbfb3baa06e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-12 12:01:21 +00:00
Taran Singh
1e57ae6ebc
[automerger skipped] DO NOT MERGE: Prevent non-system IME from becoming device admin am: 27a97f4583 -s ours am: a8bd8948d1 -s ours am: 02ef9c46ec -s ours am: 7fa313e00e -s ours am: c2fd42d3ec -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23605250
Change-Id: I4aa5ea739be755d177579a8ba20d7199212437b8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-12 12:01:19 +00:00
Treehugger Robot
b0442fec71
[automerger skipped] Merge "DO NOT MERGE: Prevent non-system IME from becoming device admin" into sc-qpr1-dev am: e5f9ab14ce -s ours am: 2c62993aca -s ours am: 71bf0d7467 -s ours am: 66539a3cda -s ours am: c60277f91e -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23605250
Change-Id: Ic97d060edfdc10fd91a6239002512678be1242c2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-12 12:01:07 +00:00
Taran Singh
3a73889f73
[automerger skipped] DO NOT MERGE: Prevent non-system IME from becoming device admin am: 27a97f4583 -s ours am: a8bd8948d1 -s ours am: 02ef9c46ec -s ours am: 7fa313e00e -s ours am: c2fd42d3ec -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23605250
Change-Id: I319c19409c8dc2e9f4e4a0a987a2e24c7b9da5e2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-12 12:01:05 +00:00
Treehugger Robot
98a322c812
[automerger skipped] Merge "DO NOT MERGE: Prevent non-system IME from becoming device admin" into tm-dev am: 8e3d6f0a10 am: 000cdf1b5d -s ours am: 1dafc2d68b -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23545068
Change-Id: Iee246a3fe994592b20a7acf40103fdd36ab18da8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-12 12:01:00 +00:00
Taran Singh
29a7db6e73
[automerger skipped] DO NOT MERGE: Prevent non-system IME from becoming device admin am: 0976cd789d am: fdf0f64b90 -s ours am: 047e435950 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23545068
Change-Id: I30053b8b7252a05b64566064494f08703bcedc91
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-12 12:00:58 +00:00
Treehugger Robot
7a8357ca00
[automerger skipped] Merge "DO NOT MERGE: Prevent non-system IME from becoming device admin" into tm-dev am: 8e3d6f0a10 am: 000cdf1b5d -s ours am: 1dafc2d68b -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23545068
Change-Id: I2443d13f5645ae8b79b21e1e5191b0d9d4dbe801
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-12 12:00:44 +00:00
Taran Singh
2482176dc9
[automerger skipped] DO NOT MERGE: Prevent non-system IME from becoming device admin am: 0976cd789d am: fdf0f64b90 -s ours am: 047e435950 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23545068
Change-Id: Id411f7a26fb4f4dc73a584aef8a1b99e7a843539
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-12 12:00:42 +00:00
Weng Su
5c2d727b8f
[RESTRICT AUTOMERGE] Restrict ApnEditor settings
...
- Finish ApnEditor settings if user is not an admin
- Finish ApnEditor settings if user has DISALLOW_CONFIG_MOBILE_NETWORKS restriction
Bug: 279902472
Test: manual test
make RunSettingsRoboTests ROBOTEST_FILTER=ApnEditorTest
Change-Id: Iecdbbff7e21dfb11e3ba385858747a220cfd3e04
2023-07-12 11:30:45 +00:00
Treehugger Robot
06ac924785
[automerger skipped] Merge "DO NOT MERGE: Prevent non-system IME from becoming device admin" into rvc-dev am: 6976a3137c am: 4e41118949 -s ours am: 2291d2e8ea -s ours am: acd1cc3ebf -s ours am: c6bded5070 -s ours am: 78b208efc2 -s ours am: 23eb92c4ba -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23541011
Change-Id: I2d0a112995f0c006d1893fccd789f8902147aec6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-12 11:21:22 +00:00
Taran Singh
3bcf0a8dd5
[automerger skipped] DO NOT MERGE: Prevent non-system IME from becoming device admin am: 0ee3b96e59 am: fc05ca8c35 -s ours am: 5a4bdbb9cf -s ours am: 800f77c404 -s ours am: 6f90f9bcea -s ours am: cdca52fc84 -s ours am: fa6de7b263 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23541011
Change-Id: Id080467a82e2644442a93783fec46b710d68dd63
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-12 11:21:17 +00:00
Treehugger Robot
835ffd7e17
[automerger skipped] Merge "DO NOT MERGE: Prevent non-system IME from becoming device admin" into rvc-qpr-dev am: 6cf9c58fa5 -s ours am: 78d86e927c -s ours am: a81ed851af -s ours am: 34ea30a0d3 -s ours am: aa7349f210 -s ours am: deb426263d -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23603846
Change-Id: I062d370fedc188c1f7f93585d9f3d516a99dd3e6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-12 11:20:46 +00:00
Taran Singh
d4f7fcb409
[automerger skipped] DO NOT MERGE: Prevent non-system IME from becoming device admin am: 0564ec25bb -s ours am: c07555d438 -s ours am: 56c4d2a5a5 -s ours am: 045a9bfd32 -s ours am: 417c199efa -s ours am: 675b4b3c62 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23603846
Change-Id: Ic4e0707be257619784e6efe3fe830816d03228bd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-12 11:20:42 +00:00
Treehugger Robot
26c8ebc082
[automerger skipped] Merge "DO NOT MERGE: Prevent non-system IME from becoming device admin" into sc-dev am: 9fa4b1e0a6 am: 3c039ca648 -s ours am: 2df32f537f -s ours am: 4e7bbcce82 -s ours am: c36d4dd62b -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23545222
Change-Id: I8b0818e26d8f4e2cc5fc410893b8cc5832c141c9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-12 11:20:08 +00:00
Taran Singh
e199ee1b47
[automerger skipped] DO NOT MERGE: Prevent non-system IME from becoming device admin am: cb2b753094 am: c362ee7dc2 -s ours am: a9488a71bc -s ours am: ab11731a5b -s ours am: cd7282da37 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23545222
Change-Id: I83b58bddceb64cab9b96255e3c1bd45b8f372835
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-12 11:20:04 +00:00
Treehugger Robot
3daa00eee5
[automerger skipped] Merge "DO NOT MERGE: Prevent non-system IME from becoming device admin" into sc-v2-dev am: 376bf07767 -s ours am: 30ea3d3cec -s ours am: 38280de428 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23605760
Change-Id: I87427d5e6ec5ceb4a7d6f2e872d3838b36a31b2e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-12 11:19:35 +00:00
Taran Singh
6c693471db
[automerger skipped] DO NOT MERGE: Prevent non-system IME from becoming device admin am: 76b536abc8 -s ours am: 76f3f2efe8 -s ours am: e11d0e8502 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23605760
Change-Id: I549bcd217f142a4519d14d52251380593a2f1055
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-12 11:19:30 +00:00
Treehugger Robot
c60277f91e
[automerger skipped] Merge "DO NOT MERGE: Prevent non-system IME from becoming device admin" into sc-qpr1-dev am: e5f9ab14ce -s ours am: 2c62993aca -s ours am: 71bf0d7467 -s ours am: 66539a3cda -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23605250
Change-Id: I2a322bb4e6fa9061e5e096b0ce6b13a1bc119c38
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-12 11:19:01 +00:00
Taran Singh
c2fd42d3ec
[automerger skipped] DO NOT MERGE: Prevent non-system IME from becoming device admin am: 27a97f4583 -s ours am: a8bd8948d1 -s ours am: 02ef9c46ec -s ours am: 7fa313e00e -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23605250
Change-Id: I69e6f399519cd7a3f387677de73943daa9cd21e2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-12 11:18:58 +00:00
Treehugger Robot
1dafc2d68b
[automerger skipped] Merge "DO NOT MERGE: Prevent non-system IME from becoming device admin" into tm-dev am: 8e3d6f0a10 am: 000cdf1b5d -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23545068
Change-Id: Id21fe1b2fcd064f0cf037e5059783e6039d4b58f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-12 11:18:24 +00:00
Taran Singh
047e435950
[automerger skipped] DO NOT MERGE: Prevent non-system IME from becoming device admin am: 0976cd789d am: fdf0f64b90 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23545068
Change-Id: Iaafff271c0d5da951b91794fb558991dd3a99e4a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-12 11:18:17 +00:00
Treehugger Robot
23eb92c4ba
[automerger skipped] Merge "DO NOT MERGE: Prevent non-system IME from becoming device admin" into rvc-dev am: 6976a3137c am: 4e41118949 -s ours am: 2291d2e8ea -s ours am: acd1cc3ebf -s ours am: c6bded5070 -s ours am: 78b208efc2 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23541011
Change-Id: Ie770b0e9443ca2b41ec6d391cd272167bb52cabe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-12 10:40:13 +00:00
Taran Singh
fa6de7b263
[automerger skipped] DO NOT MERGE: Prevent non-system IME from becoming device admin am: 0ee3b96e59 am: fc05ca8c35 -s ours am: 5a4bdbb9cf -s ours am: 800f77c404 -s ours am: 6f90f9bcea -s ours am: cdca52fc84 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23541011
Change-Id: If3b2a79546e48c37a8e1494b90384b56102b8769
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-12 10:40:11 +00:00
Treehugger Robot
deb426263d
[automerger skipped] Merge "DO NOT MERGE: Prevent non-system IME from becoming device admin" into rvc-qpr-dev am: 6cf9c58fa5 -s ours am: 78d86e927c -s ours am: a81ed851af -s ours am: 34ea30a0d3 -s ours am: aa7349f210 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23603846
Change-Id: I541483291a075ae33949878d2666e4dfbf43a61e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-12 10:39:52 +00:00
Taran Singh
675b4b3c62
[automerger skipped] DO NOT MERGE: Prevent non-system IME from becoming device admin am: 0564ec25bb -s ours am: c07555d438 -s ours am: 56c4d2a5a5 -s ours am: 045a9bfd32 -s ours am: 417c199efa -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23603846
Change-Id: I9da4908defb622743e10fe8211167d6e95d2f3ff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-12 10:39:50 +00:00
Treehugger Robot
c36d4dd62b
[automerger skipped] Merge "DO NOT MERGE: Prevent non-system IME from becoming device admin" into sc-dev am: 9fa4b1e0a6 am: 3c039ca648 -s ours am: 2df32f537f -s ours am: 4e7bbcce82 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23545222
Change-Id: Ie427ca724b62fe0434bde8457780d245bd930175
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-12 10:39:31 +00:00
Taran Singh
cd7282da37
[automerger skipped] DO NOT MERGE: Prevent non-system IME from becoming device admin am: cb2b753094 am: c362ee7dc2 -s ours am: a9488a71bc -s ours am: ab11731a5b -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23545222
Change-Id: I6006e1f4ad5abfdccbc26fae9cf52a826cf532da
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-12 10:39:28 +00:00
Treehugger Robot
38280de428
[automerger skipped] Merge "DO NOT MERGE: Prevent non-system IME from becoming device admin" into sc-v2-dev am: 376bf07767 -s ours am: 30ea3d3cec -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23605760
Change-Id: I319e9fc72a45405ebf255f0c8c710c227fe7f1fb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-12 10:39:08 +00:00
Taran Singh
e11d0e8502
[automerger skipped] DO NOT MERGE: Prevent non-system IME from becoming device admin am: 76b536abc8 -s ours am: 76f3f2efe8 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23605760
Change-Id: I18a4da8fdf54ba0ffb11f79beceaa8721b01e431
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-12 10:39:06 +00:00
Treehugger Robot
66539a3cda
[automerger skipped] Merge "DO NOT MERGE: Prevent non-system IME from becoming device admin" into sc-qpr1-dev am: e5f9ab14ce -s ours am: 2c62993aca -s ours am: 71bf0d7467 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23605250
Change-Id: Ia8d3021b6416c446432b38dabdeff2e566831cc7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-12 10:38:50 +00:00
Taran Singh
7fa313e00e
[automerger skipped] DO NOT MERGE: Prevent non-system IME from becoming device admin am: 27a97f4583 -s ours am: a8bd8948d1 -s ours am: 02ef9c46ec -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23605250
Change-Id: I4a89c8243a4f40b07a61724747757039741ddc97
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-12 10:38:48 +00:00
Treehugger Robot
000cdf1b5d
Merge "DO NOT MERGE: Prevent non-system IME from becoming device admin" into tm-dev am: 8e3d6f0a10
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23545068
Change-Id: I79b66024b8a6411f289270d19416d08849c81746
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-12 10:38:21 +00:00
Taran Singh
fdf0f64b90
DO NOT MERGE: Prevent non-system IME from becoming device admin am: 0976cd789d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23545068
Change-Id: I46dae6492ca7512344dee008c782f20a49f700e0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-12 10:38:16 +00:00
Weng Su
bd5e3c0c05
[RESTRICT AUTOMERGE] Restrict ApnEditor settings
...
- Finish ApnEditor settings if user is not an admin
- Finish ApnEditor settings if user has DISALLOW_CONFIG_MOBILE_NETWORKS restriction
Bug: 279902472
Test: manual test
atest -c ApnEditorTest
Change-Id: Iecdbbff7e21dfb11e3ba385858747a220cfd3e04
Merged-In: I5cf984000244b4ad901c6a4977a1368279323e0a
2023-07-12 07:05:37 +00:00
Weng Su
ef2fd5b7cd
[RESTRICT AUTOMERGE] Restrict ApnEditor settings
...
- Finish ApnEditor settings if user is not an admin
- Finish ApnEditor settings if user has DISALLOW_CONFIG_MOBILE_NETWORKS restriction
Bug: 279902472
Test: manual test
atest -c ApnEditorTest
Change-Id: Iecdbbff7e21dfb11e3ba385858747a220cfd3e04
Merged-In: I5cf984000244b4ad901c6a4977a1368279323e0a
2023-07-12 06:46:21 +00:00
Bill Yi
05c15f8e73
Merge TQ3A.230705.001 to aosp-main - DO NOT MERGE
...
Merged-In: I2d14107a37340b8b34ae71c67f7f705a272324b9
I2d14107a37340b8b34ae71c67f7f705a272324b9
Merged-In: I302a25ff6f386b4b533354fcb841abd01aa1d837
I302a25ff6f386b4b533354fcb841abd01aa1d837
Merged-In: Idd06d93032c0616c59f6f9738a2f5dea9fc9e53c
Idd06d93032c0616c59f6f9738a2f5dea9fc9e53c
Change-Id: Ie7d523720aff6d3ac1879130df097474e417d215
2023-07-11 15:30:02 -07:00
Weng Su
e3b554b296
[RESTRICT AUTOMERGE] Restrict ApnEditor settings
...
- Finish ApnEditor settings if user is not an admin
- Finish ApnEditor settings if user has DISALLOW_CONFIG_MOBILE_NETWORKS restriction
Bug: 279902472
Test: manual test
atest -c ApnEditorTest
Change-Id: Iecdbbff7e21dfb11e3ba385858747a220cfd3e04
2023-07-11 08:35:17 +00:00
Weng Su
6afcad7626
[RESTRICT AUTOMERGE] Restrict ApnEditor settings
...
- Finish ApnEditor settings if user is not an admin
- Finish ApnEditor settings if user has DISALLOW_CONFIG_MOBILE_NETWORKS restriction
Bug: 279902472
Test: manual test
atest -c ApnEditorTest
Change-Id: Iecdbbff7e21dfb11e3ba385858747a220cfd3e04
2023-07-11 08:34:53 +00:00
Chaohui Wang
47803f6b10
Merge "[Regulatory Labels] Load labels from overlays" into udc-d1-dev am: fe38ff963a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23939155
Change-Id: I159db196a31270e20a213796e8236eb9808d418a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-11 08:30:00 +00:00
Chaohui Wang
fe38ff963a
Merge "[Regulatory Labels] Load labels from overlays" into udc-d1-dev
2023-07-11 07:50:49 +00:00
SongFerng Wang
96c2da1340
Merge "To fix waiting too long issue when psim -> esim" into udc-d1-dev am: 717ce2b91f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23913080
Change-Id: Iabad339cd438114562b16a495f2e9c15249c38b9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-11 05:22:21 +00:00
SongFerng Wang
717ce2b91f
Merge "To fix waiting too long issue when psim -> esim" into udc-d1-dev
2023-07-11 04:55:18 +00:00
Chaohui Wang
f3d6684e14
Fix crash when call getMobileTemplate am: 9132535e5e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24002328
Change-Id: Ia4b74067049da536c8f98230e588b579379fdad6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-10 08:12:07 +00:00
Chaohui Wang
9132535e5e
Fix crash when call getMobileTemplate
...
There are 2 versions of getMobileTemplate.
The previous Change I7865823d6af2c812afa35d047bd79b60ae4b0fb7 change
from the correct version to the wrong version.
Change back to fix the issue.
Fix: 290381395
Test: manual - on Mobile Settings page
Test: unit test
Change-Id: Icb3147558176d53dc77e7bd39ab54a5dad13c12b
Merged-In: I6227f973ec38e5b0520f54a41ac2ede2929a1bcc
2023-07-10 14:20:07 +08:00
