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
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
Bill Yi
d1e4580468
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: b477262850
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23940500
Change-Id: Iaf83d1fe7c518ec6223b28e73135ed42fdfcd6e6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-08 18:30:43 +00:00
Bill Yi
96c5a8a5b1
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: dee2369371
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23940500
Change-Id: I36d2b7efe75a75b07423b475d9034450472e25a9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-08 18:30:18 +00:00
Bill Yi
4c82c3ca22
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev
2023-07-08 17:48:12 +00:00
Bill Yi
2653ed9e80
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev
2023-07-08 17:48:12 +00:00
Bill Yi
b477262850
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev
2023-07-08 17:46:44 +00:00
Bill Yi
bd4bc23a25
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 654749ad92
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23940496
Change-Id: I9071edeaea4d07ef36333f37acf5fec64440a9ca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-08 05:10:31 +00:00
Weng Su
5a17d39db7
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
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:4e18e7414c674a1c5bc69961c03499849b4aefd2 )
Merged-In: Iecdbbff7e21dfb11e3ba385858747a220cfd3e04
Change-Id: Iecdbbff7e21dfb11e3ba385858747a220cfd3e04
2023-07-07 12:11:33 +00:00
Bill Yi
e2b36788ee
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I57532b0f680c53ecec50efb02e1a928db5d8e34f
2023-07-06 21:37:18 -07:00
Bill Yi
dee2369371
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I02a6098fdd3a3fb6513c144727933e3a53950302
2023-07-06 21:34:38 -07:00
Bill Yi
3a30f4c565
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I6e92d82e7a1f28a79d8e3472eb029dba3a04a88f
2023-07-06 21:31:02 -07:00
Bill Yi
654749ad92
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I801988cf943f003d970bb958e975548da9e3d265
2023-07-06 21:26:52 -07:00
Treehugger Robot
8bb22c308d
[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: ea4433d4a0
-s ours am: 4cec60c74e
-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: I13f85b1586b6eba55aa30ed8a42bc8fea411c9ca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-07 03:57:14 +00:00
Taran Singh
b44e1919c5
[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: a36809487f
-s ours am: a8a0b282ae
-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: I01a97c19d4802c1cf9bb10a3fa822ed6c373e3a3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-07 03:57:08 +00:00
Treehugger Robot
4cec60c74e
[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: ea4433d4a0
-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: Ib33ea98062bca1f2358cde556afa623d7741e51e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-07 03:16:39 +00:00
Taran Singh
a8a0b282ae
[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: a36809487f
-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: Ic7d3f7080eaa3e8750b09eedc9ffad4f01a2328f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-07 03:16:36 +00:00
Treehugger Robot
ea4433d4a0
[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: I051f44d9fe22668d7dbcfc73e22df6c524be4e5f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-07 02:31:41 +00:00
Taran Singh
a36809487f
[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: I5e16f0c949c5d0ffc86c0660a6756e94f44b3b30
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-07 02:31:38 +00:00
Treehugger Robot
ba718477ea
[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: ef431049c9
-s ours am: 6b1a169820
-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: I71852c61ae0a3a4cf6d09aa68338d7234a5ca4cd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-07 01:44:47 +00:00
Taran Singh
517e6edc93
[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: 0d0954c8bc
-s ours am: 4c6c18ae10
-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: I115188d39dac280ab14005705d427dd0f744c85d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-07 01:44:43 +00:00
Treehugger Robot
8b0139ce9d
[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: 4ad9d18da2
-s ours am: f836f55043
-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: Ib2e13fa85e20b6b7a728d8f1d1155c40b847da9b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-07 01:44:09 +00:00
Taran Singh
add1702ed9
[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: 18510c531b
-s ours am: 2ebd6e63e8
-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: Ifd14f48171aec41043c0588086f5a00ad8871e9d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-07 01:44:03 +00:00
Treehugger Robot
78b208efc2
[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 skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23541011
Change-Id: I1796224633276eb222cf2326e04d355bf4405ad3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-07 01:41:45 +00:00
Taran Singh
cdca52fc84
[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 skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23541011
Change-Id: I40d6325025fcc760fcfc8e609dc021791542e5d5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-07 01:41:41 +00:00
Treehugger Robot
6b1a169820
[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: ef431049c9
-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: Ib8c4de428c5337df553eb7a37001d63574b582a0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-07 01:03:18 +00:00
Taran Singh
4c6c18ae10
[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: 0d0954c8bc
-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: I5725ca716f28d5d6c042ee92fe1046e7571c7385
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-07 01:03:16 +00:00
Treehugger Robot
f836f55043
[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: 4ad9d18da2
-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: I17131b058303de7b36e6dc16a29c41286a6af969
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-07 01:02:53 +00:00
Taran Singh
2ebd6e63e8
[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: 18510c531b
-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: Ia2c905f24dd0024920d9a28365adf8d3bf61e36d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-07 01:02:49 +00:00
Treehugger Robot
c6bded5070
[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 skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23541011
Change-Id: I94034482c39f90b81d91292417afc98cb25256ba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-07 01:02:48 +00:00
Taran Singh
6f90f9bcea
[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 skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23541011
Change-Id: Ie5da6055722b74bfffd1798b583b5e468ca754d0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-07 01:02:42 +00:00
Treehugger Robot
ef431049c9
[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: I47723fff1c665e3dfd512817e54b361f9fc7e4d7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-07 00:18:41 +00:00
Taran Singh
0d0954c8bc
[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: I58c379c9fc35721d0a9db187c309b583ae5d365a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-07 00:18:37 +00:00
Treehugger Robot
4ad9d18da2
[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: I94c678d026054e4d83e53d1e8a58696347de3359
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-07 00:18:06 +00:00
Taran Singh
18510c531b
[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: I61b341633738b0e77af77e17b018ee9585e265e5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-07 00:18:03 +00:00
Treehugger Robot
02c3eca0a7
[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: 9966aaad9e
-s ours am: 2ba102d1cb
-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: Iebed60d1be1825b598c162458f7278fc29604d8a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-07 00:15:50 +00:00
Taran Singh
0a697c0f37
[automerger skipped] DO NOT MERGE: Prevent non-system IME from becoming device admin am: 76b536abc8
-s ours am: 76f3f2efe8
-s ours am: 3dece06cb3
-s ours am: 9006b1027e
-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: I53de99b29cb98602924ed55e4a50d5ae2579fd37
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-07 00:15:46 +00:00
Treehugger Robot
7e62ba20d7
[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: 4c0c2f4fe4
-s ours am: 2b31fa004f
-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: I5281f66d88d2dab890b65bdc1d2ccbaf643f9c1d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-07 00:15:18 +00:00
Taran Singh
02086812ed
[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: ebe5235c23
-s ours am: b24681d7d7
-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: I9420b24414d26416323e99f76f7904a340d4dd6c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-07 00:15:14 +00:00
Treehugger Robot
acd1cc3ebf
[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 skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23541011
Change-Id: Ibafbe3ba9ed0797d44b6fc6c70508f372f0d6f58
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-07 00:14:57 +00:00
Taran Singh
800f77c404
[automerger skipped] DO NOT MERGE: Prevent non-system IME from becoming device admin am: 0ee3b96e59
am: fc05ca8c35
-s ours am: 5a4bdbb9cf
-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: I4932d8e3157fdb613fa19067d54de649015cdd4c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-07 00:14:55 +00:00
Treehugger Robot
70deaf3698
[automerger skipped] Merge "DO NOT MERGE: Prevent non-system IME from becoming device admin" into tm-dev am: 8e3d6f0a10
am: 25522ce664
am: 05f50bb0f6
-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: I14ce8292d859e68aac080e11594d14b5949923b8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-07 00:14:47 +00:00
Taran Singh
030a2fa4f3
[automerger skipped] DO NOT MERGE: Prevent non-system IME from becoming device admin am: 0976cd789d
am: eda2ffbeca
-s ours am: 4a95efc3bc
-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: I5dcf65359d0e6729683c995a28854c6ea25b166c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-07 00:14:42 +00:00
Treehugger Robot
2ba102d1cb
[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: 9966aaad9e
-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: I67e2ad529c6589dca5a7e2059f7c9a822bf861b0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-06 23:22:29 +00:00
Taran Singh
9006b1027e
[automerger skipped] DO NOT MERGE: Prevent non-system IME from becoming device admin am: 76b536abc8
-s ours am: 76f3f2efe8
-s ours am: 3dece06cb3
-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: Ifb44e299bdd9e15be11ee8694139532fc63dcfac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-06 23:22:27 +00:00
Treehugger Robot
2b31fa004f
[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: 4c0c2f4fe4
-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: Ie48bbf99940ecd1b9766a2e68b3589753203c16c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-06 23:22:08 +00:00
Taran Singh
b24681d7d7
[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: ebe5235c23
-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: I4d72cf051b47fcc9582d894af7a1570f98b3252e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-06 23:22:05 +00:00
Treehugger Robot
05f50bb0f6
Merge "DO NOT MERGE: Prevent non-system IME from becoming device admin" into tm-dev am: 8e3d6f0a10
am: 25522ce664
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23545068
Change-Id: I87a4c05ad8b09c8d18ac1822c11d54b94d202ff8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-06 23:21:43 +00:00
Taran Singh
4a95efc3bc
[automerger skipped] DO NOT MERGE: Prevent non-system IME from becoming device admin am: 0976cd789d
am: eda2ffbeca
-s ours
...
am skip reason: skipped by user tarandeep
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23545068
Change-Id: I34f7f296eda9c53206da6c482e6917db6ee44d0a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-06 23:21:41 +00:00