Commit Graph

132702 Commits

Author SHA1 Message Date
Taran Singh
7314c665df [automerger skipped] DO NOT MERGE: Prevent non-system IME from becoming device admin am: 0976cd789d am: eda2ffbeca -s ours am: 4a95efc3bc -s ours am: 5c0e6518ab -s ours am: 538e659c95 -s ours am: d31b313dbe -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: Id8840b6526f0657f82a0beac5a6a49e8ac32e8cd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-07 02:56:18 +00:00
Treehugger Robot
bae046ea19 [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: 02c3eca0a7 -s ours am: 3d2e0cfbc3 -s ours am: 0926653965 -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: I0874358cc401751deb26252bacb0eb6956eca6aa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-07 02:55:34 +00:00
Taran Singh
4ff56f7619 [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: 0a697c0f37 -s ours am: 0500147b55 -s ours am: 31ace239df -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: Id76363e7005ab0f89ef8a7f9c3140bfe3b3c1bad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-07 02:55:32 +00:00
Treehugger Robot
df4a78256a [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: 7e62ba20d7 -s ours am: d8b55682ab -s ours am: 9fa49d1d15 -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: Ie29f32b7a7d3ef6fb366d8a9b0f02d9a9a63e661
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-07 02:52:49 +00:00
Taran Singh
2bb7984a3b [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: 02086812ed -s ours am: c0df6e81a6 -s ours am: bb3f168f9e -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: I0e3ea23e9872480536aac2c387dd39d3e4bb85c1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-07 02:52:47 +00:00
Treehugger Robot
0db918d8a8 [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: 70deaf3698 -s ours am: 524de38fd8 -s ours am: b4ecdb714a -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: I34730e72e5e05fca4df08621f9576f7ad2908ef5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-07 02:51:51 +00:00
Taran Singh
33ed5961af [automerger skipped] DO NOT MERGE: Prevent non-system IME from becoming device admin am: 0976cd789d am: eda2ffbeca -s ours am: 4a95efc3bc -s ours am: 030a2fa4f3 -s ours am: 8afe7cadee -s ours am: dd2cb171bb -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: Iacf0989b6f6e7c8e8a38bd762bf4beda0403c89e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-07 02:51:47 +00:00
Treehugger Robot
a6af3ba7c5 [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: 02c3eca0a7 -s ours am: 3d2e0cfbc3 -s ours am: 8479ffbb2f -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: Ie015017bf69e2ac0e9342121447389342e42fa1b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-07 02:33:47 +00:00
Taran Singh
1c859dd5ed [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: 0a697c0f37 -s ours am: 0500147b55 -s ours am: f9c348b89a -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: Ib721c114e8089b2b2e595f6a13428404aea6297e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-07 02:33:45 +00:00
Treehugger Robot
3922de0c60 [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: 7e62ba20d7 -s ours am: d8b55682ab -s ours am: d0e2090afb -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: Ia6f36f9b1c860554573ca8146790bad718f92080
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-07 02:32:14 +00:00
Taran Singh
2860270d69 [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: 02086812ed -s ours am: c0df6e81a6 -s ours am: 0224f56ecb -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: I9ec6d43add5b1a19e827706f29b1393d3d573602
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-07 02:32:12 +00:00
Treehugger Robot
033a14dbba [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: 70deaf3698 -s ours am: 524de38fd8 -s ours am: ab54f1e1c4 -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: I7a706f422a5bcd3be02b8dca6da14ab1b77e8185
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-07 02:31:42 +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
9cec95876d [automerger skipped] DO NOT MERGE: Prevent non-system IME from becoming device admin am: 0976cd789d am: eda2ffbeca -s ours am: 4a95efc3bc -s ours am: 030a2fa4f3 -s ours am: 8afe7cadee -s ours am: 00fadf3935 -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: I65a92d09f6ee81df25879499423af0467fe78962
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-07 02:31:40 +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
5ef26eb916 [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: dc7e74e20c -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: Ic9f4781b731e54f85053e52dd0bf0c70df8b93fe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-07 02:29:40 +00:00
Taran Singh
55f96e6177 [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: a66fa7c91b -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: I32ad0632087521cca92f1a8886502dc14693c719
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-07 02:29:35 +00:00
Automerger Merge Worker
16cdedd165 Merge changes from topic "am-b90859b388c34c15b480cf2da68ac051" into udc-dev-plus-aosp
* changes:
  [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: ba718477ea -s ours
  [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: 517e6edc93 -s ours
2023-07-07 02:29:18 +00:00
Treehugger Robot
d546c60f7d [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: ba718477ea -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: I41a7786a13cceb5252706b9818dfcfaabf4ec99f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-07 02:29:09 +00:00
Taran Singh
4d69fc7349 [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: 517e6edc93 -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: I08377abab5c63fc083a359e7a6f0f7ce8409d8f7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-07 02:29:07 +00:00
Automerger Merge Worker
e2c51c1167 Merge changes from topic "am-8d2be1df9a9c4230816b7bdea829e514" into udc-dev-plus-aosp
* changes:
  [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: 43e8411ea3 -s ours
  [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: 5d7872512c -s ours
2023-07-07 02:29:04 +00:00
Treehugger Robot
81279b4c74 [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: ba718477ea -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: I84d1b22ae115adbe1f550c4179cd9aeefefe4389
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-07 02:28:48 +00:00
Taran Singh
e978c2c6cc [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: 517e6edc93 -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: Id4397d93af0dd312eef36aedcc21384676f52acc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-07 02:28:46 +00:00
Treehugger Robot
5135d8f003 [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: ba718477ea -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: If63dd26ebc858d4e2c7d48272e90a2071c387a8b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-07 02:28:45 +00:00
Treehugger Robot
3c83a775fd [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: 43e8411ea3 -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: I0cd59c29b9506c41e193c60bcbeeda8c434064e6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-07 02:28:42 +00:00
Taran Singh
a14c9ffdaf [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: 517e6edc93 -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: I43319c4b695936e9ad50bf385c72d576f9c169f6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-07 02:28:42 +00:00
Treehugger Robot
4c01570bac [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: 8b0139ce9d -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: Ib191037648929e51149730506285eb5641ce5f77
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-07 02:28:40 +00:00
Taran Singh
a2a1987f67 [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: add1702ed9 -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: I0a59aec0de65f3bfed4d9d354bc2856c04043f10
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-07 02:28:39 +00:00
Taran Singh
b95e36f8a7 [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: 5d7872512c -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: I6ae0f8bcd6448c1cdc1cf414250b6c400abc373e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-07 02:28:37 +00:00
Treehugger Robot
0254172bb4 [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: 8b0139ce9d -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: Ic0a6fdf1e6a18e70e4b04506665d2cb44caf6e2f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-07 02:28:25 +00:00
Taran Singh
c39ebdf4ba [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: add1702ed9 -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: Id397f5b0327b95b5d90e52e5b9bd7b4f9a483cde
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-07 02:28:22 +00:00
Treehugger Robot
12eb28a198 [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: 8b0139ce9d -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: Iea6a08b369b0488cbd4c97ccfda456b391b11adc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-07 02:28:19 +00:00
Taran Singh
006ba36322 [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: add1702ed9 -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: Iaed3bef7f9e52e55c0241fa1553f217e847c1e21
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-07 02:28:16 +00:00
Treehugger Robot
f29a8febf2 [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: 02c3eca0a7 -s ours am: 559cfe4afc -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: If0b925d7917b48c76ec3ee90819be4e37edec50a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-07 01:47:52 +00:00
Taran Singh
39e65a5d53 [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: 0a697c0f37 -s ours am: 50981bb3d6 -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: I726598c642204261f5e065b3d7fad6cffee38180
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-07 01:47:49 +00:00
Automerger Merge Worker
6cd7393a21 Merge changes from topic "am-b56b85ea3c0d4196a832257fbcf9a961" into udc-dev-plus-aosp am: d6c0b319ba
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23605250

Change-Id: Ie2e02c8f5393c5ada6ae7e04e607f111ba7988a3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-07 01:47:24 +00:00
Treehugger Robot
6b488dd984 [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: 7e62ba20d7 -s ours am: 11c532101f -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: I676e6103f81bfbad9c93bdbd77ab6c1520a260b7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-07 01:47:21 +00:00
Treehugger Robot
d1b6f8bd76 [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: b14b767d47 -s ours am: 90c8ce053e -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: I50b3a4c550fee227845d95921141e2c9c4c2deb9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-07 01:46:40 +00:00
Taran Singh
db05202a95 [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: 3de8786bf4 -s ours am: bfe085a2a8 -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: I0b175cd46c8f684b99b93ac1421ce5f4cd24ecc0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-07 01:46:37 +00:00
Treehugger Robot
7e78f50437 [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: 02c3eca0a7 -s ours am: c655087009 -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: I8f6e3e47ca01dca4af76b692ce4b666ba83b29e8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-07 01:45:54 +00:00
Automerger Merge Worker
999f42d014 Merge changes from topic "am-4e7ca78306974e4f93f211c1f71f6c9f" into udc-dev-plus-aosp am: b01c860592
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23545068

Change-Id: I2074aa042e4af5f15f22708e1da97b3101c879ba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-07 01:45:54 +00:00
Taran Singh
4fa8cb5318 [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: 0a697c0f37 -s ours am: 821f86a8b0 -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: Id4c2e6bf94416e70dcef1756a8ee02584f790233
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-07 01:45:52 +00:00
Treehugger Robot
710af3945b [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: 70deaf3698 -s ours am: 1b8b56c9db -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: I3313d042fc399854ff24e81230da4a0aa63e2eb1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-07 01:45:51 +00:00
Treehugger Robot
6639587611 [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: 7e62ba20d7 -s ours am: 77ff8f0f57 -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: I67299bc992afe494ce287b7591bb4377ed76a1b6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-07 01:45:27 +00:00
Taran Singh
912c54c2f8 [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: 02086812ed -s ours am: d2760b36e1 -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: I5bcaba9c90cc3e490b6c4d954b887b2a6acaa841
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-07 01:45:25 +00:00
Treehugger Robot
8479ffbb2f [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: 02c3eca0a7 -s ours am: 3d2e0cfbc3 -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: I54f845ad7756a033f4ea708d675d8cede74a8fdb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-07 01:45:23 +00:00
Treehugger Robot
dc7e74e20c [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: I419be69bd04e9a5b495d5c49885a98a4b8b970a3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-07 01:45:23 +00:00
Taran Singh
a66fa7c91b [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: I21ec83ac3a29bbf2e1c6aa09e81e6cb1bf081566
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-07 01:45:21 +00:00
Taran Singh
f9c348b89a [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: 0a697c0f37 -s ours am: 0500147b55 -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: I76cd22525c87f71b550d35b21188b71ff29e4630
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-07 01:45:20 +00:00
Treehugger Robot
62eee75d6b [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: efff8b3ea1 -s ours am: 347a237f51 -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: I7052fab79de7cbc24fc4fc2a99edcb30a7cc0bf9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-07 01:45:01 +00:00