PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
132,702 Commits 1 Branch 0 Tags
78f3760d26a30cae2637b812497f25e5afdb19cc
Commit Graph

132702 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bill Yi
3f21bb3ba0 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I1d4a3c3a0dcb4669918482a2b0022f1eedd37f75
 2023-07-13 21:22:04 -07:00
Bill Yi
9fd352f12f Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I1ce687c28620f4880b1d170c913f5a456797f129
 2023-07-13 21:19:38 -07:00
Bill Yi
4304a67102 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I9ba5bbbdfad59efc65dc654e13dcb881948a2653
 2023-07-13 21:11:32 -07:00
Chun-Wei Wang
a671c3014e Merge "Re-enable most tests" into udc-qpr-dev 2023-07-14 03:52:01 +00:00
Peiyong Lin
b6c849e27c Merge "Add warning on enabling ANGLE." into udc-qpr-dev am: e8e302b551 am: 7da022c74c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24041836

Change-Id: Ieb4d272ea6870e24f50aea7f4b40a5672638ef3c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-14 02:32:01 +00:00
Bill Lin
88bc013487 Merge "Update screen lock and biometrics options in order" into udc-qpr-dev am: 8ea74c3d76 am: f0278e6835 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23896224

Change-Id: I470152428e4fe0ecf1fc9e8f3d499fca89d114db
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-14 02:06:19 +00:00
Peiyong Lin
7da022c74c Merge "Add warning on enabling ANGLE." into udc-qpr-dev am: e8e302b551 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24041836

Change-Id: I4055ff6b3712b7c9029555b3259ce888ca40f976
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-14 01:45:39 +00:00
Chun-Wei Wang
d155195c6b Remove invalid test 
1. Remove the invalid test
   Per ag/23288037, the feature is now always available
2. Rename
   processAndValidatePasswordRequirements_autoPinEnabled_defaultPinMinimumLength

Bug: 291146670
Test: atest ChooseLockPasswordTest
Change-Id: If96ac99aa1a98636a14017c880892436767c4a41
 2023-07-14 01:25:09 +00:00
Chun-Wei Wang
d72b22e1e1 Remove invalid test 
The auto pin confirm feature is now always available (ag/23288037).
The test is no longer valid.

Bug: 291146670
Test: atest ChooseLockPasswordTest
Change-Id: I45ab17cf3833e0fc8cad5679d6ef19957a2f60b7
 2023-07-14 01:24:08 +00:00
Peiyong Lin
e8e302b551 Merge "Add warning on enabling ANGLE." into udc-qpr-dev 2023-07-14 00:28:03 +00:00
Bill Yi
eec083c169 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ifa6d29ecf5518b91b6439055fa684e371c0dcc5f
 2023-07-13 17:14:07 -07:00
Bill Yi
2764a59fac Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I77ce443619168d050a0da92c30f51199b412566d
 2023-07-13 17:12:30 -07:00
Bill Yi
3d999ce533 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I731e98ceaf81340bfa91fa5d63a09e5f95a7cc56
 2023-07-13 17:06:52 -07:00
Bill Lin
f0278e6835 Merge "Update screen lock and biometrics options in order" into udc-qpr-dev am: 8ea74c3d76 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23896224

Change-Id: Ia5ee770bc367d6dc30610dbdc4582d343a28df32
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-14 00:01:30 +00:00
Bill Lin
8ea74c3d76 Merge "Update screen lock and biometrics options in order" into udc-qpr-dev 2023-07-13 23:18:19 +00:00
Chun-Wei Wang
203906516e Re-enable most tests 
Most tests are still successful. We don't want to impact
too much test coverage by disabling all tests.

Bug: 291146670
Test: atest ChooseLockPasswordTest --rerun-until-failure 50
Change-Id: Ia8266dc5d44ea9271a28e1bee80c3855b3c2d52b
 2023-07-13 23:14:38 +00:00
Pavel Grafov
735f8ee883 Merge "Set profile pattern visibility controller in xml" into main 2023-07-13 10:11:48 +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
Chaohui Wang
36b8227073 Remove context from powerUsageFeatureProvider 
PowerUsageFeatureProviderImpl is created by using application context,
no need pass context in when get.

Bug: 286764889
Test: m Settings
Change-Id: Iec81e98648fcb2f6a20978ef4ce164e1af50a804
 2023-07-13 09:58:54 +08: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
Peiyong Lin
39eb3a5ad0 Add warning on enabling ANGLE. 
Enabling ANGLE on incompatible devices may cause some applications to
crash, add a warning.

Bug: b/287909344
Test: atest SettingsRoboTests:GraphicsDriverEnableAngleAsSystemDriverControllerTest
Change-Id: I4f856ee1912a59052a6aaf7dff087ce1b649935e
 2023-07-12 18:10:03 +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