PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
127,572 Commits 1 Branch 0 Tags
f71d183d0bdaae655ce0c0b81c2a3210715b984c
Commit Graph

127572 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Treehugger Robot
07678daaf7 Merge "Do not show LE audio toggle in Device Detail by default" into udc-d1-dev am: 1f9f114495 am: 20b82c3646 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23898723

Change-Id: I302b91cd8502cca57a28e74cbbf72cf962d6468f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-07 11:21:28 +00:00
Treehugger Robot
5da1b03545 Merge "Do not show LE audio toggle in Device Detail by default" into udc-d1-dev am: 1f9f114495 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23898723

Change-Id: I2398f07f2f4936ab26a59a2df285ea3dae05bb94
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-07 10:42:29 +00:00
Treehugger Robot
20b82c3646 Merge "Do not show LE audio toggle in Device Detail by default" into udc-d1-dev am: 1f9f114495 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23898723

Change-Id: I3536f29c771b9233790e6852ab6dc4cb0b58b531
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-07 10:38:02 +00:00
SongFerngWang
d94ac12190 To fix waiting too long issue when psim -> esim 
if the user swithes slot from psim to esim, then the settings
need to wait the simSlotMapping completed and it has a timer to avoid
UI stay here too long.

Since the framework did not sned the carrier config changed with vaild
subId in MEP + psim->esim case, it cause the settings does not know the
simSlotMapping completed and it stay here until timeout.

For MEP case, changing this condition as SimSlotStatusChanged

Bug: 273813956
Test: atest UiccSlotUtilTest
Change-Id: Ic09dbcb3629fe13770f3ad301c0a396d6745969f
 2023-07-07 10:22:49 +00:00
Treehugger Robot
1f9f114495 Merge "Do not show LE audio toggle in Device Detail by default" into udc-d1-dev 2023-07-07 10:02:51 +00:00
ykhung
ef66549e64 Add a mechanism to log battery usage periodic job events 
Example history log:
      	Jul 07, 2023, 15:28:51 SCHEDULE_JOB triggerTime=Jul 07, 2023, 16:00:00
      	Jul 07, 2023, 15:32:16 FETCH_USAGE_DATA
      	Jul 07, 2023, 15:32:17 INSERT_USAGE_DATA size=37
      	Jul 07, 2023, 15:43:45 FETCH_USAGE_DATA
      	Jul 07, 2023, 15:43:48 INSERT_USAGE_DATA size=47
      	Jul 07, 2023, 15:43:49 SCHEDULE_JOB triggerTime=Jul 07, 2023, 16:00:00

Bug: 284893240
Test: make test RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.fuelgauge
Change-Id: I45a1ce0ce9b70f095702727e53d7b7ce8824abdb
 2023-07-07 17:47:19 +08:00
Treehugger Robot
797bd60dde [automerger skipped] Merge "DO NOT MERGE: Prevent non-system IME from becoming device admin" into rvc-dev am: 6976a3137c am: 4e41118949 -s ours am: 2291d2e8ea -s ours am: acd1cc3ebf -s ours am: c6bded5070 -s ours am: 78b208efc2 -s ours am: ea4433d4a0 -s ours am: 4cec60c74e -s ours am: 8bb22c308d -s ours am: 48fef8a8be -s ours am: 16c7483abf -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: Id8c790093fe106b292872633275a05d46deb90d9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-07 06:15:32 +00:00
Taran Singh
5f13cb1e2a [automerger skipped] DO NOT MERGE: Prevent non-system IME from becoming device admin am: 0ee3b96e59 am: fc05ca8c35 -s ours am: 5a4bdbb9cf -s ours am: 800f77c404 -s ours am: 6f90f9bcea -s ours am: cdca52fc84 -s ours am: a36809487f -s ours am: a8a0b282ae -s ours am: b44e1919c5 -s ours am: bd463821cc -s ours am: 4126d17340 -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: I32079c08dce661492cab6dfb950b2968904fd6ac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-07 06:15:29 +00:00
Bill Yi
9d671a4d3f Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: If55ace5ecb93501f1b1da2ef0db3a71a206c361e
 2023-07-06 22:31:41 -07:00
Treehugger Robot
8026d18a73 [automerger skipped] Merge "DO NOT MERGE: Prevent non-system IME from becoming device admin" into rvc-dev am: 6976a3137c am: 4e41118949 -s ours am: 2291d2e8ea -s ours am: acd1cc3ebf -s ours am: c6bded5070 -s ours am: 78b208efc2 -s ours am: ea4433d4a0 -s ours am: 4cec60c74e -s ours am: 8bb22c308d -s ours am: 48fef8a8be -s ours am: f3b58bc93e -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: I7767f4e7f0c2f8643fe097881b8e561d1ea5099a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-07 05:29:16 +00:00
Taran Singh
6a86c4b452 [automerger skipped] DO NOT MERGE: Prevent non-system IME from becoming device admin am: 0ee3b96e59 am: fc05ca8c35 -s ours am: 5a4bdbb9cf -s ours am: 800f77c404 -s ours am: 6f90f9bcea -s ours am: cdca52fc84 -s ours am: a36809487f -s ours am: a8a0b282ae -s ours am: b44e1919c5 -s ours am: bd463821cc -s ours am: 54ad43e475 -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: I2c07ecd5a54dd828e9bd3294b4786cc833f5ed02
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-07 05:29:14 +00:00
Treehugger Robot
148b2c9ceb [automerger skipped] Merge "DO NOT MERGE: Prevent non-system IME from becoming device admin" into rvc-dev am: 6976a3137c am: 4e41118949 -s ours am: 2291d2e8ea -s ours am: acd1cc3ebf -s ours am: c6bded5070 -s ours am: 78b208efc2 -s ours am: ea4433d4a0 -s ours am: 4cec60c74e -s ours am: 8bb22c308d -s ours am: 1c4a7c230e -s ours am: 2c27a5c6c7 -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: I9fa098a6f771cedd0c4c19c0c904ef179feda945
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-07 05:28:27 +00:00
Taran Singh
36b9438881 [automerger skipped] DO NOT MERGE: Prevent non-system IME from becoming device admin am: 0ee3b96e59 am: fc05ca8c35 -s ours am: 5a4bdbb9cf -s ours am: 800f77c404 -s ours am: 6f90f9bcea -s ours am: cdca52fc84 -s ours am: a36809487f -s ours am: a8a0b282ae -s ours am: b44e1919c5 -s ours am: e08dceb2a2 -s ours am: cbe4121297 -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: Ic73a638aa06e7b7f285392fd6cd0d921d6fef27b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-07 05:28:24 +00:00
Treehugger Robot
f8f38d6db1 [automerger skipped] Merge "DO NOT MERGE: Prevent non-system IME from becoming device admin" into rvc-dev am: 6976a3137c am: 4e41118949 -s ours am: 2291d2e8ea -s ours am: acd1cc3ebf -s ours am: c6bded5070 -s ours am: 78b208efc2 -s ours am: ea4433d4a0 -s ours am: 4cec60c74e -s ours am: dc03e2136d -s ours am: 94bbb59134 -s ours am: 662aa53f92 -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: I67738e6ea6f34d3995ca3cd8aafcce85efbd1ac9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-07 05:27:57 +00:00
Taran Singh
fa8e846501 [automerger skipped] DO NOT MERGE: Prevent non-system IME from becoming device admin am: 0ee3b96e59 am: fc05ca8c35 -s ours am: 5a4bdbb9cf -s ours am: 800f77c404 -s ours am: 6f90f9bcea -s ours am: cdca52fc84 -s ours am: a36809487f -s ours am: a8a0b282ae -s ours am: e2e2122c71 -s ours am: 84e2fb4f6a -s ours am: 32dc4dd918 -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: I39f5131ab84da3d64707ef5f46268fad6d99eaab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-07 05:27:53 +00:00
Treehugger Robot
16c7483abf [automerger skipped] Merge "DO NOT MERGE: Prevent non-system IME from becoming device admin" into rvc-dev am: 6976a3137c am: 4e41118949 -s ours am: 2291d2e8ea -s ours am: acd1cc3ebf -s ours am: c6bded5070 -s ours am: 78b208efc2 -s ours am: ea4433d4a0 -s ours am: 4cec60c74e -s ours am: 8bb22c308d -s ours am: 48fef8a8be -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: Iba85952239988ce4d1838c7ab96fe2a21cef7ad4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-07 05:27:09 +00:00
Taran Singh
4126d17340 [automerger skipped] DO NOT MERGE: Prevent non-system IME from becoming device admin am: 0ee3b96e59 am: fc05ca8c35 -s ours am: 5a4bdbb9cf -s ours am: 800f77c404 -s ours am: 6f90f9bcea -s ours am: cdca52fc84 -s ours am: a36809487f -s ours am: a8a0b282ae -s ours am: b44e1919c5 -s ours am: bd463821cc -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: Ib79766bef456f47521c471ef23e729b0a4714dbd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-07 05:27:05 +00:00
Treehugger Robot
f3b58bc93e [automerger skipped] Merge "DO NOT MERGE: Prevent non-system IME from becoming device admin" into rvc-dev am: 6976a3137c am: 4e41118949 -s ours am: 2291d2e8ea -s ours am: acd1cc3ebf -s ours am: c6bded5070 -s ours am: 78b208efc2 -s ours am: ea4433d4a0 -s ours am: 4cec60c74e -s ours am: 8bb22c308d -s ours am: 48fef8a8be -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: I084d8ea184a2ccbab574eed0e597f15d6f9baa1e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-07 05:24:42 +00:00
Taran Singh
54ad43e475 [automerger skipped] DO NOT MERGE: Prevent non-system IME from becoming device admin am: 0ee3b96e59 am: fc05ca8c35 -s ours am: 5a4bdbb9cf -s ours am: 800f77c404 -s ours am: 6f90f9bcea -s ours am: cdca52fc84 -s ours am: a36809487f -s ours am: a8a0b282ae -s ours am: b44e1919c5 -s ours am: bd463821cc -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: I32c7fad54464708695becdabe0f1679f9c524137
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-07 05:24:39 +00:00
Bill Yi
582cf66067 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Idc462ee6332fe825138ef085aed3bdfb0dcdee62
 2023-07-06 22:16:10 -07:00
Treehugger Robot
2c27a5c6c7 [automerger skipped] Merge "DO NOT MERGE: Prevent non-system IME from becoming device admin" into rvc-dev am: 6976a3137c am: 4e41118949 -s ours am: 2291d2e8ea -s ours am: acd1cc3ebf -s ours am: c6bded5070 -s ours am: 78b208efc2 -s ours am: ea4433d4a0 -s ours am: 4cec60c74e -s ours am: 8bb22c308d -s ours am: 1c4a7c230e -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: I8b5236432e961195aa5c2bfcf4746ab74a335e17
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-07 04:43:25 +00:00
Taran Singh
cbe4121297 [automerger skipped] DO NOT MERGE: Prevent non-system IME from becoming device admin am: 0ee3b96e59 am: fc05ca8c35 -s ours am: 5a4bdbb9cf -s ours am: 800f77c404 -s ours am: 6f90f9bcea -s ours am: cdca52fc84 -s ours am: a36809487f -s ours am: a8a0b282ae -s ours am: b44e1919c5 -s ours am: e08dceb2a2 -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: I5a3d8feed077daa68c8830aff7be4e5f8ece5ad4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-07 04:43:23 +00:00
Treehugger Robot
662aa53f92 [automerger skipped] Merge "DO NOT MERGE: Prevent non-system IME from becoming device admin" into rvc-dev am: 6976a3137c am: 4e41118949 -s ours am: 2291d2e8ea -s ours am: acd1cc3ebf -s ours am: c6bded5070 -s ours am: 78b208efc2 -s ours am: ea4433d4a0 -s ours am: 4cec60c74e -s ours am: dc03e2136d -s ours am: 94bbb59134 -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: I2efdb50dabebc07ec155d5a9c354c0af7985b5fd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-07 04:42:57 +00:00
Taran Singh
32dc4dd918 [automerger skipped] DO NOT MERGE: Prevent non-system IME from becoming device admin am: 0ee3b96e59 am: fc05ca8c35 -s ours am: 5a4bdbb9cf -s ours am: 800f77c404 -s ours am: 6f90f9bcea -s ours am: cdca52fc84 -s ours am: a36809487f -s ours am: a8a0b282ae -s ours am: e2e2122c71 -s ours am: 84e2fb4f6a -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: I153b59add5f1a737b2627139558340267835eccb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-07 04:42:52 +00:00
Treehugger Robot
1c4a7c230e [automerger skipped] Merge "DO NOT MERGE: Prevent non-system IME from becoming device admin" into rvc-dev am: 6976a3137c am: 4e41118949 -s ours am: 2291d2e8ea -s ours am: acd1cc3ebf -s ours am: c6bded5070 -s ours am: 78b208efc2 -s ours am: ea4433d4a0 -s ours am: 4cec60c74e -s ours am: 8bb22c308d -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: I9a472a80e152b63a74dc1a42376992f693a0caa1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-07 04:42:38 +00:00
Taran Singh
e08dceb2a2 [automerger skipped] DO NOT MERGE: Prevent non-system IME from becoming device admin am: 0ee3b96e59 am: fc05ca8c35 -s ours am: 5a4bdbb9cf -s ours am: 800f77c404 -s ours am: 6f90f9bcea -s ours am: cdca52fc84 -s ours am: a36809487f -s ours am: a8a0b282ae -s ours am: b44e1919c5 -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: I0f0c4f7cf30989c8a9f81cd3f8d9a7900890665f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-07 04:42:34 +00:00
Treehugger Robot
48fef8a8be [automerger skipped] Merge "DO NOT MERGE: Prevent non-system IME from becoming device admin" into rvc-dev am: 6976a3137c am: 4e41118949 -s ours am: 2291d2e8ea -s ours am: acd1cc3ebf -s ours am: c6bded5070 -s ours am: 78b208efc2 -s ours am: ea4433d4a0 -s ours am: 4cec60c74e -s ours am: 8bb22c308d -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: I510e59c8836a9b747ff1a3e19650fb2ce7378800
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-07 04:42:33 +00:00
Taran Singh
bd463821cc [automerger skipped] DO NOT MERGE: Prevent non-system IME from becoming device admin am: 0ee3b96e59 am: fc05ca8c35 -s ours am: 5a4bdbb9cf -s ours am: 800f77c404 -s ours am: 6f90f9bcea -s ours am: cdca52fc84 -s ours am: a36809487f -s ours am: a8a0b282ae -s ours am: b44e1919c5 -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: Ie155c32e36a42ad600c32a5c278409d043720866
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-07 04:42:31 +00:00
Bill Yi
288b16d401 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ib23b0ace0dc102844178ee2bd671886b7c2f0c09
 2023-07-06 21:38:09 -07:00
Bill Yi
e2b36788ee Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I57532b0f680c53ecec50efb02e1a928db5d8e34f
 2023-07-06 21:37:18 -07:00
Bill Yi
dee2369371 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I02a6098fdd3a3fb6513c144727933e3a53950302
 2023-07-06 21:34:38 -07:00
Bill Yi
89d279b73f Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Iaaac18d136c9f399b9a9313e7fed700fcb4b12b1
 2023-07-06 21:32:47 -07:00
Bill Yi
3a30f4c565 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I6e92d82e7a1f28a79d8e3472eb029dba3a04a88f
 2023-07-06 21:31:02 -07:00
Bill Yi
654749ad92 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I801988cf943f003d970bb958e975548da9e3d265
 2023-07-06 21:26:52 -07:00
Treehugger Robot
94bbb59134 [automerger skipped] Merge "DO NOT MERGE: Prevent non-system IME from becoming device admin" into rvc-dev am: 6976a3137c am: 4e41118949 -s ours am: 2291d2e8ea -s ours am: acd1cc3ebf -s ours am: c6bded5070 -s ours am: 78b208efc2 -s ours am: ea4433d4a0 -s ours am: 4cec60c74e -s ours am: dc03e2136d -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: I5fe7f3278df8da188a9477e2a4623d2e708f35c1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-07 04:20:29 +00:00
Taran Singh
84e2fb4f6a [automerger skipped] DO NOT MERGE: Prevent non-system IME from becoming device admin am: 0ee3b96e59 am: fc05ca8c35 -s ours am: 5a4bdbb9cf -s ours am: 800f77c404 -s ours am: 6f90f9bcea -s ours am: cdca52fc84 -s ours am: a36809487f -s ours am: a8a0b282ae -s ours am: e2e2122c71 -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: Idaedd4a1ed748509f2ce677821d47369e394c6a8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-07 04:20:25 +00:00
Treehugger Robot
3be314de49 [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: 5ef26eb916 -s ours am: 345abf1b17 -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: I85779d2ac5b3293bfde6085b91101903d9bb79bc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-07 04:02:07 +00:00
Taran Singh
1a874b4252 [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: 55f96e6177 -s ours am: 9c0a1b8e0f -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: I281e282127ef2fafaa89049835be7bfd1020f521
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-07 04:02:05 +00:00
Treehugger Robot
68b50e082d [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: 5135d8f003 -s ours am: b53b395ee3 -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: I04743b40741101ec88eb29d469a472d69e239d68
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-07 04:01:40 +00:00
Taran Singh
ae751685c9 [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: a14c9ffdaf -s ours am: d619542c12 -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: Iae56cc94561fb08f4f5503c7c897704e39fac0bb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-07 04:01:38 +00:00
Automerger Merge Worker
affd8cf65f Merge changes from topic "am-b90859b388c34c15b480cf2da68ac051" into udc-dev-plus-aosp am: 16cdedd165 am: d25992e3d6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23603846

Change-Id: I27b10b7fe114a98bd75e4b451bc5eb7f71d2e304
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-07 04:01:11 +00:00
Treehugger Robot
dbd662ab47 [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: d546c60f7d -s ours am: 867eade385 -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: Ibbff4db34456ab06c31054e1125302f115d54a2f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-07 04:01:09 +00:00
Automerger Merge Worker
fb27416e50 Merge changes from topic "am-381268eab73b4ba29f9c53484324b315" into udc-qpr-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: 8b0139ce9d -s ours am: 12eb28a198 -s ours am: 7396f09c8f -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: add1702ed9 -s ours am: 006ba36322 -s ours am: d01d5a54b4 -s ours
 2023-07-07 04:00:51 +00:00
Treehugger Robot
907224890f [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: 12eb28a198 -s ours am: 7396f09c8f -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: I87462fb8e2263926ad87a9e65719e16240c19051
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-07 04:00:39 +00:00
Automerger Merge Worker
70ddc4a746 Merge changes from topic "am-8d2be1df9a9c4230816b7bdea829e514" into udc-dev-plus-aosp am: e2c51c1167 am: 5d7a29a38d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23545222

Change-Id: I971f74ff040ff243a83eaf69e087966bf41110e0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-07 04:00:38 +00:00
Taran Singh
e0b09ca63a [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: 006ba36322 -s ours am: d01d5a54b4 -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: I860247431b76b6e61aa262e07d272f130ab0f37e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-07 04:00:37 +00:00
Treehugger Robot
f9381b3c69 [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: 3c83a775fd -s ours am: 1b23ddbb9f -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: I23b2c5363c6180e673e9ceb17fd2a4ff03f6c1a8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-07 04:00:35 +00:00
Treehugger Robot
f83b031ff7 [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: 4c01570bac -s ours am: 2e7ea414ed -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: Ie51de5ae9466737f6853ca29438552fa66f16608
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-07 04:00:07 +00:00
Taran Singh
34e3c4b8ea [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: a2a1987f67 -s ours am: e50f7dfc5c -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: I355b087cac8e8e83407a998f6d59285b9ebf0522
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-07 04:00:04 +00:00
Treehugger Robot
47557fb38a [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: 5135d8f003 -s ours am: 7ab633418c -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: I062d69d7e0312b6b07a3d129ea4b31f8e0647a95
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-07 03:58:40 +00:00