Commit Graph

132702 Commits

Author SHA1 Message Date
Treehugger Robot
310a61d382 [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: 06ac924785 -s ours am: 773ffcdc3d -s ours am: 30585305f3 -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: I4a95ca737a0dc41d36ea28556b34daabed2b79fa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-12 13:30:06 +00:00
Taran Singh
b26cb6b499 [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: 3bcf0a8dd5 -s ours am: 64301079f7 -s ours am: 47cd7ab12b -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: I1bb6c369fd739b1647df993ad6731795c909ddc4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-12 13:30:03 +00:00
Treehugger Robot
cbd1e8ab72 [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: 74b860fbf2 -s ours am: c7034457f5 -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: I8c3cd8571eec1a97bd38b03134d9ee45cfdfb8b5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-12 13:29:53 +00:00
Taran Singh
5bf940a67a [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: 9e5320fd85 -s ours am: be43a14591 -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: I61ffee25c0ae1f6cb0ffa1b8146d1545f56a4c3d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-12 13:29:50 +00:00
Treehugger Robot
c9327d743b [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: 835ffd7e17 -s ours am: 37da7c1ed1 -s ours am: 885f41e829 -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: I5a32f93a75a96bf36ef7ccba9475a18e2a23ea4c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-12 13:29:39 +00:00
Taran Singh
dd87fe2bf8 [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: d4f7fcb409 -s ours am: 9233165157 -s ours am: fb3df2aa6c -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: If46edd84eeb1c60b6005865cc2025575adc123fe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-12 13:29:36 +00:00
Treehugger Robot
5a8a14d832 [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: e7e672475a -s ours am: c47023b016 -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: I17f8aa2cc62c99d11ca0f911531b3cf1a05b66ce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-12 13:29:12 +00:00
Taran Singh
98ba2b4bcd [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: 7beb8d89d1 -s ours am: 3bdd79866c -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: I097a6aa06258d195a00e0d5ea4a6f88d59eb922c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-12 13:29:09 +00:00
Automerger Merge Worker
7cf67e1888 Merge changes from topic "am-47dfae7d86de4657834db071d055ab39" into udc-qpr-dev-plus-aosp
* changes:
  [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: b0442fec71 -s ours am: 8a6620158f -s ours
  [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: 3a73889f73 -s ours am: 49a858cc5c -s ours
2023-07-12 13:29:07 +00:00
Treehugger Robot
04fa083f5a [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: b0442fec71 -s ours am: 8a6620158f -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: I2901321c8d8e9c038b5fca209256bde5b85fdce2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-12 13:28:49 +00:00
Taran Singh
f819848f58 [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: 3a73889f73 -s ours am: 49a858cc5c -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: Ia598f83a19eafc28582986b64b703a3bfb2274bc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-12 13:28:46 +00:00
Automerger Merge Worker
546e9558f9 Merge changes from topic "am-ef6b8ecc97fe4fe3b5b64faebe66e7b5" into udc-qpr-dev-plus-aosp
* changes:
  [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: df0234a563 -s ours am: 1a80da1dba -s ours
  [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: fc49acca28 -s ours am: 47a3ce177b -s ours
2023-07-12 13:28:36 +00:00
Treehugger Robot
4832b1dc04 [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: df0234a563 -s ours am: 1a80da1dba -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: I59c855021289a7f604d44e44c77b0875de240a80
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-12 13:28:26 +00:00
Taran Singh
1e5d7ab6ba [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: fc49acca28 -s ours am: 47a3ce177b -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: Iad4082cf7484160aa87df88e9b3bbd4007a10c4f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-12 13:28:22 +00:00
Automerger Merge Worker
b461bc7934 Merge changes from topic "am-f7ebbb4ea87842ae902fd9c9c7f0f54a" into udc-qpr-dev-plus-aosp
* changes:
  [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: 7a8357ca00 -s ours am: ca8e3aaf62 -s ours
  [automerger skipped] DO NOT MERGE: Prevent non-system IME from becoming device admin am: 0976cd789d am: fdf0f64b90 -s ours am: 047e435950 -s ours am: 2482176dc9 -s ours am: 49d0d9ffe5 -s ours
2023-07-12 13:28:12 +00:00
Treehugger Robot
185c0a0bfc [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: 7a8357ca00 -s ours am: ca8e3aaf62 -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: Ibf4f575b49fca64a91395a347a11b82cb09416af
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-12 13:27:54 +00:00
Treehugger Robot
c9e16ad2c2 [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: 1b1009d355 -s ours am: 45a93cc11e -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: I1cafc4d1f2e722149f10df45713306a5416aff65
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-12 13:27:52 +00:00
Taran Singh
8e987da183 [automerger skipped] DO NOT MERGE: Prevent non-system IME from becoming device admin am: 0976cd789d am: fdf0f64b90 -s ours am: 047e435950 -s ours am: 2482176dc9 -s ours am: 49d0d9ffe5 -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: Id36a313f6998a4232417751beea09c36b7f8fcb5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-12 13:27:51 +00:00
Taran Singh
fdb90e838f [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: 1e57ae6ebc -s ours am: 4f99150a82 -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: I7329f1ec7fcec6bddf00f0531c00104d156121fe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-12 13:27:50 +00:00
Treehugger Robot
823f845877 [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: 98a322c812 -s ours am: 0db70ecd9c -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: Ie3fbf86d95f4bb870bd023a4945e993e1811c5b1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-12 13:27:20 +00:00
Taran Singh
5131e322dd [automerger skipped] DO NOT MERGE: Prevent non-system IME from becoming device admin am: 0976cd789d am: fdf0f64b90 -s ours am: 047e435950 -s ours am: 29a7db6e73 -s ours am: 79e49983ef -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: I6c744c853c6e0886b605278afa799c0c358fe97d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-12 13:27:18 +00:00
Treehugger Robot
01323ca6ce [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: 06ac924785 -s ours am: 720f9d49f5 -s ours am: b3c79ffd83 -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: I02efabc8482c42094d41a6c27b8b1f5c661d06a3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-12 13:23:58 +00:00
Taran Singh
d6c11a49f5 [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: 3bcf0a8dd5 -s ours am: 88bbba67ca -s ours am: 502effe39f -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: Ifa63bcae00e9d5d3527e5f2141440eb7d694e45b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-12 13:23:56 +00:00
Treehugger Robot
85b9a45d26 [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: 835ffd7e17 -s ours am: bd9783ca70 -s ours am: ec84ba9237 -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: I837b8ef3da89c88bfc6aff78133350ab7e7f5544
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-12 13:23:28 +00:00
Taran Singh
ef72c38087 [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: d4f7fcb409 -s ours am: 36eb51dac7 -s ours am: 5b3c8a4085 -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: Ib7ec84d980700259589b654856ad5114b7cb63ae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-12 13:23:25 +00:00
Treehugger Robot
c552cf62a1 [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: 036bf7ec0a -s ours am: 2f92b09ebb -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: I99bbc11cd413e40ec62bd0d6a16d75e969a4d905
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-12 13:23:02 +00:00
Taran Singh
c3f45d9e94 [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: 5d5c3516e6 -s ours am: 153346109d -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: If5d5e55aafc96fac3ca6a32cd21f5a75857688b2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-12 13:22:59 +00:00
Treehugger Robot
799a163dd5 [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: 74b860fbf2 -s ours am: dfff14de25 -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: I668a55072bb3e5a540c27b85affbbc0e57a73c9f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-12 13:22:35 +00:00
Taran Singh
f781272811 [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: 9e5320fd85 -s ours am: d9ab1ac7bb -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: Id254d5daf3b9bb6ac388869529f28cde706640ca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-12 13:22:33 +00:00
Treehugger Robot
fc1ade41eb [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: b0442fec71 -s ours am: b5d6aa58f2 -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: I434625ecad78856ab8403c6b01532fb5b635336f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-12 13:22:12 +00:00
Taran Singh
2bd6bf6851 [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: 3a73889f73 -s ours am: 3e1a1b2a59 -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: Iad49e0f833b43a48b63ca372ea099175d04e94d3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-12 13:22:10 +00:00
Treehugger Robot
77f785969b [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: 7a8357ca00 -s ours am: dd43229ac9 -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: I10f734bad1bc3c9ecf138a5da09ecc443102f007
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-12 13:21:40 +00:00
Taran Singh
0ca2a6e11d [automerger skipped] DO NOT MERGE: Prevent non-system IME from becoming device admin am: 0976cd789d am: fdf0f64b90 -s ours am: 047e435950 -s ours am: 2482176dc9 -s ours am: 82b29176e3 -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: I5dd62920bc4f106a443d71cecca0dff9dc1f4faf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-12 13:21:34 +00:00
Treehugger Robot
30585305f3 [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: 06ac924785 -s ours am: 773ffcdc3d -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: I9a033076ceadd94c20fa17e46e8da80159e41d49
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-12 12:47:01 +00:00
Taran Singh
47cd7ab12b [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: 3bcf0a8dd5 -s ours am: 64301079f7 -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: I03648e17b19c151f310cf26ba8e5bb789b717907
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-12 12:46:58 +00:00
Treehugger Robot
885f41e829 [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: 835ffd7e17 -s ours am: 37da7c1ed1 -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: Ia51bf75f8c3d3fdbb1821d9bac8af6b3128d4f1d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-12 12:46:32 +00:00
Taran Singh
fb3df2aa6c [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: d4f7fcb409 -s ours am: 9233165157 -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: I073885d0226906e35e827563334f1ca362e291e0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-12 12:46:30 +00:00
Treehugger Robot
03506bb198 [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: 06ac924785 -s ours am: 720f9d49f5 -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: I39ea40a68d9b4ebdf9ee5bbbe937f6e8665a43d4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-12 12:46:28 +00:00
Taran Singh
4435371838 [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: 3bcf0a8dd5 -s ours am: 88bbba67ca -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: Id84e6dd21a31478a796e274342f2b879e7765bd0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-12 12:46:25 +00:00
Treehugger Robot
c47023b016 [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: e7e672475a -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: I7c9879043594c99a19b28c9ce5c58ac577816eae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-12 12:46:05 +00:00
Taran Singh
3bdd79866c [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: 7beb8d89d1 -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: I82a061f530a47d82e93e16cb5d79b3568c47e9f4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-12 12:46:03 +00:00
Treehugger Robot
8b7a9778a5 [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: 835ffd7e17 -s ours am: bd9783ca70 -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: I9e5488295bbb6dffbb98cd8b0f9d6d9faa93aff9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-12 12:46:00 +00:00
Taran Singh
0f44db18f3 [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: d4f7fcb409 -s ours am: 36eb51dac7 -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: I61ed0b5e654128cc99cfd2630372b2de8a53fa68
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-12 12:45:58 +00:00
Treehugger Robot
1a80da1dba [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: df0234a563 -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: Ib8a42fe23a132521beb21114c4735d2b0a1fee57
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-12 12:45:41 +00:00
Taran Singh
47a3ce177b [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: fc49acca28 -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: I2c33309c26652f3d35f79eddbda7de4d4efb9025
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-12 12:45:39 +00:00
Treehugger Robot
439b26d3e5 [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: 036bf7ec0a -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: I2865dee6f80311caf15cfcfeb1f2b5b09cb90703
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-12 12:45:36 +00:00
Taran Singh
057911c54d [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: 5d5c3516e6 -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: Ia27cb1036f68ee549f23174e0d030bb325421448
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-12 12:45:34 +00:00
Treehugger Robot
45a93cc11e [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: 1b1009d355 -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: Ib7cec763e2a773204547607c44d5043ebc4554d7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-12 12:45:17 +00:00
Taran Singh
4f99150a82 [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: 1e57ae6ebc -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: I4fdc181f8555783d7905664f209876d4128186e6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-12 12:45:15 +00:00
Treehugger Robot
c7034457f5 [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: 74b860fbf2 -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: Ic3bf83e5f47ccda34c6df25bc5ed57c4849a31e3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-12 12:45:12 +00:00