Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
132,423 Commits 1 Branch 0 Tags
bdfab1de2665e48e3bc69bc6aac7679616476d0b
Commit Graph

132423 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Kohsuke Yatoh
bdfab1de26 Define "Add network" preference in XML. 
Move the definition from Java to XML, so that SearchIndexProvider can
include it in the getXmlResourcesToIndex().
Also update getNonIndexableKeys() to return the corresponding key when
the preference is hidden.

If the Internet settings are restricted, "Add network" still appears on
search. When clicked, it opens the Internet settings page in restricted
mode, so that users can know that the settings are restricted.

Bug: 224421762
Fix: 224421762
Test: atest SettingsRoboTests:NetworkProviderSettingsTest
Change-Id: Ie9ea58070843a390844b461ce766f0ce29e64fab
 2023-08-15 11:41:05 +00:00
Treehugger Robot
07e0e5c86f Merge "Extend resource OWNERS exemption to other res folders (res-product). " into main am: 24db817a65 am: 70b29d5f28 am: ec8e7816f3 am: 28ac723a78 am: d47f3a29ed am: 7faa1585e7 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2597316

Change-Id: I679c8773a5347910209fabb09f03cdf86f796091
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-13 03:29:57 +00:00
Treehugger Robot
7faa1585e7 Merge "Extend resource OWNERS exemption to other res folders (res-product). " into main am: 24db817a65 am: 70b29d5f28 am: ec8e7816f3 am: 28ac723a78 am: d47f3a29ed 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2597316

Change-Id: I93a5e747f801c38480dc5c4bc377327dc190ac8d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-13 01:41:56 +00:00
Treehugger Robot
d47f3a29ed Merge "Extend resource OWNERS exemption to other res folders (res-product). " into main am: 24db817a65 am: 70b29d5f28 am: ec8e7816f3 am: 28ac723a78 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2597316

Change-Id: Id22ac8a944c8b1c166f003b6b15ff964aff6f934
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-13 00:55:29 +00:00
Treehugger Robot
28ac723a78 Merge "Extend resource OWNERS exemption to other res folders (res-product). " into main am: 24db817a65 am: 70b29d5f28 am: ec8e7816f3 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2597316

Change-Id: Id4d95b64251fb2a1c7f63c24d670befeb737a4dd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-13 00:09:29 +00:00
Treehugger Robot
ec8e7816f3 Merge "Extend resource OWNERS exemption to other res folders (res-product). " into main am: 24db817a65 am: 70b29d5f28 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2597316

Change-Id: Ie0040ddf4b2acfa4769da3bf3d49178ae4ac3873
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-12 23:26:36 +00:00
Treehugger Robot
70b29d5f28 Merge "Extend resource OWNERS exemption to other res folders (res-product). " into main am: 24db817a65 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2597316

Change-Id: If8911bebafd144d8870dd7c2b8afc7e5820eca31
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-12 22:40:10 +00:00
Treehugger Robot
24db817a65 Merge "Extend resource OWNERS exemption to other res folders (res-product). " into main 2023-07-12 22:03:16 +00:00
Bill Yi
660c6328fc [automerger skipped] Merge "Merge TQ3A.230705.001 to aosp-main - DO NOT MERGE" into main am: d4c0315d66 -s ours am: e70f33f687 -s ours am: 5775318d2a -s ours am: 39051efb1a -s ours am: 5a6cd5cd20 -s ours am: 0e6c0d2d1d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If54fcadd0ecf2fbe32bce243893382a79c38344b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-12 18:48:00 +00:00
Bill Yi
f84cd35e4d [automerger skipped] Merge TQ3A.230705.001 to aosp-main - DO NOT MERGE am: 05c15f8e73 -s ours am: 3e01c01021 -s ours am: e3c746ddf6 -s ours am: 44f02c0e0d -s ours am: 5fc5560df0 -s ours am: 5376a5e9dd -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ice8b363c423ac0f8bdf9fdcfee2a2ac4225817b9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-12 18:47:38 +00:00
Bill Yi
0e6c0d2d1d [automerger skipped] Merge "Merge TQ3A.230705.001 to aosp-main - DO NOT MERGE" into main am: d4c0315d66 -s ours am: e70f33f687 -s ours am: 5775318d2a -s ours am: 39051efb1a -s ours am: 5a6cd5cd20 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I60a17e85256614a87c66bde67eb704da830e687f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-12 18:29:14 +00:00
Bill Yi
5376a5e9dd [automerger skipped] Merge TQ3A.230705.001 to aosp-main - DO NOT MERGE am: 05c15f8e73 -s ours am: 3e01c01021 -s ours am: e3c746ddf6 -s ours am: 44f02c0e0d -s ours am: 5fc5560df0 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ida7831e83ad6332a4cebbce619299cd113e80257
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-12 18:28:51 +00:00
Joshua Mccloskey
3e042443a5 [automerger skipped] Merge "Moving FingerprintSettings to Kotlin" into udc-qpr-dev am: b1aaa313ef -s ours am: 95e8ee658b -s ours 
am skip reason: Merged-In I8eb5c30e6f2e92c256ae7c257a9d560439ba418f with SHA-1 2f46489926 is already in history

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

Change-Id: I1620f67032e9f1a2232df7ce19bb366bd522c696
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-12 18:09:57 +00:00
Joshua McCloskey
082d7a0b8e [automerger skipped] Moving FingerprintSettings to Kotlin am: b7f0d7a8ff -s ours am: 09bf6f6347 -s ours 
am skip reason: Merged-In I8eb5c30e6f2e92c256ae7c257a9d560439ba418f with SHA-1 2f46489926 is already in history

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

Change-Id: I1ed16633c44f460c0dbdb8fa640d910015e95299
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-12 18:09:53 +00:00
Bill Yi
5a6cd5cd20 [automerger skipped] Merge "Merge TQ3A.230705.001 to aosp-main - DO NOT MERGE" into main am: d4c0315d66 -s ours am: e70f33f687 -s ours am: 5775318d2a -s ours am: 39051efb1a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I34f36acb735d8113f8c4a090762e85aaea21afba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-12 17:43:28 +00:00
Bill Yi
5fc5560df0 [automerger skipped] Merge TQ3A.230705.001 to aosp-main - DO NOT MERGE am: 05c15f8e73 -s ours am: 3e01c01021 -s ours am: e3c746ddf6 -s ours am: 44f02c0e0d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iec90f8c9bad69d47d720373bc687fc10f7f4cfa3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-12 17:43:06 +00:00
Treehugger Robot
d6bb44bd21 [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: 03506bb198 -s ours am: 04031d05f8 -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: Iebb12065dbfddb800830eedabd24fbfbb0f07f06
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-12 17:41:36 +00:00
Taran Singh
74a26d8eab [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: 4435371838 -s ours am: 49c86a1a27 -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: I68fc315861c46d14166bf496185ccf0348fb268f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-12 17:41:34 +00:00
Treehugger Robot
c150d31bbc [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: 8b7a9778a5 -s ours am: 388d2ca6c6 -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: Id23301da14fc61990d6d0b988e46e07236044bed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-12 17:39:48 +00:00
Taran Singh
e56da1a717 [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: 0f44db18f3 -s ours am: 9ab933e408 -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: I7a8bd66bcbf18c8b6f57978952ce1311d44c9b57
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-12 17:39:46 +00:00
Automerger Merge Worker
a1977f8143 Merge changes from topic "am-4ed6458f15384f4ea438ed36c18a36d9" into udc-qpr-dev-plus-aosp am: 2517c5f450 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23545222

Change-Id: Ia1f0d5d05b8400f5abbd8f6a6376e861cea9087f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-12 17:38:19 +00:00
Treehugger Robot
b1a4b2411f [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: 439b26d3e5 -s ours am: 1a6e27df97 -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: Ia79765c676885918c881351b94570fcbbe0b4582
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-12 17:38:17 +00:00
Automerger Merge Worker
954f67f5ec Merge changes from topic "am-e14628239ffa4a58a651e0356d76018c" into udc-qpr-dev-plus-aosp am: cbd6b1175d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23541011

Change-Id: I726876c7493ea71a3c5c5f22493f9e99b8945424
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-12 17:37:34 +00:00
Treehugger Robot
ad7f8db6b0 [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: 310a61d382 -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: I815491c857347d5234998665fefbf73869b543fb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-12 17:37:31 +00:00
Treehugger Robot
31b1137d59 [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: cbd1e8ab72 -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: I932e7b0e759a1a7f0af376efddc76ff9fe711b07
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-12 17:36:46 +00:00
Taran Singh
4d871e52f9 [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: 5bf940a67a -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: Iaaf48bfb00cc1135866a22b49bd6f9b014f2ef6d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-12 17:36:44 +00:00
Treehugger Robot
f4154a7d0b [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: c9327d743b -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: Idf44a86b9f538b2328b04e0874b614f9f373011e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-12 17:36:16 +00:00
Taran Singh
835812baea [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: dd87fe2bf8 -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: If8187bafaea40e3e0ddcce0794eeb24ff36a5e4e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-12 17:36:14 +00:00
Treehugger Robot
10161a0086 [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: 5a8a14d832 -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: I2211ae19fe3c8c3055a00d26a8b78f0223a49846
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-12 17:35:43 +00:00
Taran Singh
63ae1f1ec5 [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: 98ba2b4bcd -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: I95ded333b4b7c3aa6127b2886f6b85d8b8074a4f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-12 17:35:41 +00:00
Automerger Merge Worker
daac992c99 Merge changes from topic "am-47dfae7d86de4657834db071d055ab39" into udc-qpr-dev-plus-aosp am: 7cf67e1888 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23605250

Change-Id: I91248a85db9b55d15405eb13fea3dcaeb2624e61
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-12 17:35:13 +00:00
Treehugger Robot
51ad90a72b [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: 04fa083f5a -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: Ib501b2baf5b6d394491883e5fc8a09841a2f4d5e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-12 17:35:11 +00:00
Automerger Merge Worker
f3253c3db8 Merge changes from topic "am-ef6b8ecc97fe4fe3b5b64faebe66e7b5" into udc-qpr-dev-plus-aosp am: 546e9558f9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23605760

Change-Id: If6c412024a386fd811218a1b15dec492069e4a08
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-12 17:34:35 +00:00
Treehugger Robot
8157086253 [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: 4832b1dc04 -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: I4d868642a1357be732585979b85988a5afd0571f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-12 17:34:33 +00:00
Automerger Merge Worker
754da37a3c Merge changes from topic "am-f7ebbb4ea87842ae902fd9c9c7f0f54a" into udc-qpr-dev-plus-aosp am: b461bc7934 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23545068

Change-Id: I8815abdff42e2ee6c0c1b86c6c549513f058367d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-12 17:33:58 +00:00
Treehugger Robot
24944e0a05 [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: 185c0a0bfc -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: I09a863cecc315e610032320027d25d64df0ed424
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-12 17:33:55 +00:00
Treehugger Robot
200f9a4c0f [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: c9e16ad2c2 -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: Ib95f0f0c2930584a630736c89e0cf794353e4a44
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-12 17:33:15 +00:00
Taran Singh
3e49047d46 [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: fdb90e838f -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: I1650daf317521f5ebc98709c4c58fe319e300031
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-12 17:33:12 +00:00
Treehugger Robot
894a1d1268 [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: 823f845877 -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: I2dbefde702a49bdacbf70f01907ac218fe224e6a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-12 17:32:06 +00:00
Taran Singh
86b66a52a8 [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: 5131e322dd -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: I3cb869d31e57eda13312c921de2d84b60efd5df3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-12 17:32:04 +00:00
Treehugger Robot
1ddf5e637b [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: 01323ca6ce -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: I209f07b7644cedab56a1eebe91a00cf2ed3abf35
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-12 17:27:51 +00:00
Taran Singh
c5ae2c8c77 [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: d6c11a49f5 -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: I29656e16e5e94bff6097bd1e7b62ca86692cae01
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-12 17:27:49 +00:00
Treehugger Robot
10c0919c9c [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: 85b9a45d26 -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: I4b5653fd94b4ff51a13aed0d4c328ca46516ec3a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-12 17:27:14 +00:00
Taran Singh
b062dba2f6 [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: ef72c38087 -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: Idaf68f3d5f80d2d0d3883de7ab9fb56a8bc2ae43
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-12 17:27:11 +00:00
Treehugger Robot
78cd2c6170 [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: c552cf62a1 -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: I0e8ba831d5e35a78f260d84bbba7ac8e485a8c0a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-12 17:26:35 +00:00
Taran Singh
6402d33e04 [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: c3f45d9e94 -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: Iaa66120ab0f477eea8e448e0db68dc3ce2266d2e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-12 17:26:30 +00:00
Treehugger Robot
16f23b13a5 [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: 799a163dd5 -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: I0af751b837e1edac66fb48f569232af2c7289b20
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-12 17:26:01 +00:00
Taran Singh
a8e91be827 [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: f781272811 -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: I3972f3100661aea5c3af2648be31f7eac9df68d5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-12 17:25:58 +00:00
Treehugger Robot
6504883531 [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: fc1ade41eb -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: I639b5fae58f7b6410f6bd8ff134874ac6f2b6453
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-12 17:25:30 +00:00
Taran Singh
c174b986c1 [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: 2bd6bf6851 -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: Icf94f33873c46b89cde1800e8d3de1a64b0b14db
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-12 17:25:28 +00:00