PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
124,438 Commits 1 Branch 0 Tags
16f86394044ea66d84ec2ecc5d89ece11703302d
Commit Graph

124438 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Graciela Putri
16f8639404 Merge "[5/n] Add graphics to app aspect ratio options" into udc-qpr-dev 2023-08-10 07:58:03 +00:00
SongFerng Wang
9265db6557 Merge "The 2G enable's summary shows the sim card name" into udc-qpr-dev 2023-08-10 04:53:18 +00:00
Bill Yi
9652e9c719 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 735a75da63 -s ours am: 5ba6d8c939 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I40d2c7cccabc1cf17c329ae6ab56c3a47ba0dfd7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-09 19:43:53 +00:00
Bill Yi
5ba6d8c939 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 735a75da63 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I359371221dc01d908c2acae69c2665acdf6d060c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-09 18:52:49 +00:00
Bill Yi
735a75da63 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import

BUG:291030186

Change-Id: Ibf93c473acbb5f6060ec039a8a1b5ec824d638f6
 2023-08-09 17:24:49 +00:00
Vania Januar
2d77f72cb6 Merge "Use two-target preference for stylus handwriting toggle." into udc-qpr-dev 2023-08-09 13:50:06 +00:00
Graciela Wissen Putri
5b97e3ecda [5/n] Add graphics to app aspect ratio options 
Static assets in Apps > App Info > Advanced > Aspect ratio
Animation in Apps > Aspect ratio

Bug: 293138315
Test: Manual
Change-Id: Ia0d5e9ab3435b395284701a2d915c9cb454593c0
 2023-08-09 13:33:06 +00:00
Treehugger Robot
611e43fe05 Merge "Fix crash after confirmLock" into udc-qpr-dev 2023-08-09 02:10:49 +00:00
Vania Januar
24a2863751 Use two-target preference for stylus handwriting toggle. 
Bug: 294279890
Test: StylusDevicesControllerTest
Change-Id: I8e83fb3a8bb76469c4bf1b99df5524930ebad086
 2023-08-08 13:50:19 +01:00
SongFerng Wang
06a37cda0b The 2G enable's summary shows the sim card name 
The 2G enable's summary should show the sim card name, not the name of service provider.

Bug: 293715485
Test: build pass

Change-Id: Iead9c4e82cd4bf26451e38ded7cbcd276e9fa5f2
 2023-08-08 09:16:16 +00:00
Milton Wu
432560177c Fix crash after confirmLock 
Stop everything in generateChallenge() on "Face and Fingerprint Unlock"
page if activity is null or finishing

Also fix ignored test cases in CombinedBiometricProfileSettingsTest

Bug: 292125215
Test: RunSettingsRoboTests ROBOTEST_FILTER=CombinedBiometricProfileSettingsTest
Change-Id: I7a272e813bfddd5d066417a74cbd63d22f511000
 2023-08-08 07:04:04 +00:00
Eric Biggers
25a1f8429c [automerger skipped] RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() am: 5f07aba150 -s ours am: 733d83d27b -s ours am: aa93927b87 -s ours am: 80ef1e0ff5 -s ours am: 7f97ac5ea7 -s ours am: 4643015447 -s ours am: f050fc11ca -s ours am: a78f35b23d -s ours am: 1679e7f685 -s ours am: 4471257a0b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I67c4f4597ddaeba1cf11f043ea4b8100c606e136
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-08 06:49:14 +00:00
Eric Biggers
5b9f246bb3 [automerger skipped] RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() am: b30cf4e8cb -s ours am: d1a31c8619 -s ours am: bf4f533ea6 -s ours am: d890d1b428 -s ours am: 8b995bbc72 -s ours am: 6ad8bea7c9 -s ours am: 618272911a -s ours am: 179b563079 -s ours am: ea68785152 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I87bdea5ecf3881611052819907987e2fa2939c35
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-08 06:48:30 +00:00
Eric Biggers
458d7445a3 [automerger skipped] RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() am: 50cb0a35c9 -s ours am: 67c4be1e52 -s ours am: 57c5a92514 -s ours am: 3a9f8d7b32 -s ours am: c598a4cf48 -s ours am: 92939c1eb3 -s ours am: 64f3b181ab -s ours am: 503317bba1 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id2527372f9bb8c406d6de44fac065272b1dbaa03
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-08 06:47:30 +00:00
Eric Biggers
4471257a0b [automerger skipped] RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() am: 5f07aba150 -s ours am: 733d83d27b -s ours am: aa93927b87 -s ours am: 80ef1e0ff5 -s ours am: 7f97ac5ea7 -s ours am: 4643015447 -s ours am: f050fc11ca -s ours am: a78f35b23d -s ours am: 1679e7f685 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I2351d4856d7365cf6e748a3a29c560b4b9ec5fef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-08 06:02:57 +00:00
Eric Biggers
ea68785152 [automerger skipped] RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() am: b30cf4e8cb -s ours am: d1a31c8619 -s ours am: bf4f533ea6 -s ours am: d890d1b428 -s ours am: 8b995bbc72 -s ours am: 6ad8bea7c9 -s ours am: 618272911a -s ours am: 179b563079 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic40a63a2013d67d961e553d65e8bffe10f8ec00c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-08 06:02:13 +00:00
Eric Biggers
503317bba1 [automerger skipped] RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() am: 50cb0a35c9 -s ours am: 67c4be1e52 -s ours am: 57c5a92514 -s ours am: 3a9f8d7b32 -s ours am: c598a4cf48 -s ours am: 92939c1eb3 -s ours am: 64f3b181ab -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I4c2220f0eaa954039c28c64e27e9a399810aa179
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-08 06:00:55 +00:00
Eric Biggers
9c22ad2b3c [automerger skipped] RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() am: 5f07aba150 -s ours am: 733d83d27b -s ours am: aa93927b87 -s ours am: 80ef1e0ff5 -s ours am: 7f97ac5ea7 -s ours am: 4643015447 -s ours am: 35e6c7b3dd -s ours am: d220b79a3f -s ours am: 4241da06f6 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I8a83b0f09d00f791f6965390acb9255472fcc61a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-08 05:24:44 +00:00
Eric Biggers
cdf5989035 [automerger skipped] RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() am: b30cf4e8cb -s ours am: d1a31c8619 -s ours am: bf4f533ea6 -s ours am: d890d1b428 -s ours am: 8b995bbc72 -s ours am: 936bf45faa -s ours am: 965d046088 -s ours am: d60572e3ed -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id00bcd77e55e93a9771eb25f896cf3dbebbdae33
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-08 05:23:45 +00:00
Eric Biggers
ae39fa7e2a [automerger skipped] RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() am: 50cb0a35c9 -s ours am: 67c4be1e52 -s ours am: 57c5a92514 -s ours am: 3a9f8d7b32 -s ours am: 95a303ce6d -s ours am: 45e6fbbb81 -s ours am: 57e52a7da8 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iba0401f8b4b555ac25cd77eb381bc92b07ce24c5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-08 05:23:03 +00:00
Eric Biggers
260fe8334e [automerger skipped] Merge "RESTRICT AUTOMERGE: Catch exceptions from setLockCredential()" into udc-dev am: dee47fbf68 -s ours am: 5a04afe7dd -s ours 
am skip reason: Merged-In I48b9119c19fb6378b1f88d36433ee4f4c8501d76 with SHA-1 99be30f895 is already in history

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

Change-Id: I4fcc007e768fea95d251401a5b1a96e6de79178b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-08 05:22:05 +00:00
Eric Biggers
7b9099571c [automerger skipped] RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() am: 8f3ca8daeb -s ours am: e10ad67f99 -s ours 
am skip reason: Merged-In I48b9119c19fb6378b1f88d36433ee4f4c8501d76 with SHA-1 99be30f895 is already in history

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

Change-Id: I899e3d112288825ddab9fb5e7cc9b764f009ba3a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-08 05:22:02 +00:00
Eric Biggers
1679e7f685 [automerger skipped] RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() am: 5f07aba150 -s ours am: 733d83d27b -s ours am: aa93927b87 -s ours am: 80ef1e0ff5 -s ours am: 7f97ac5ea7 -s ours am: 4643015447 -s ours am: f050fc11ca -s ours am: a78f35b23d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I9baf376067e9c14f416294adb2c1b1a63424e8ed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-08 05:19:34 +00:00
Eric Biggers
179b563079 [automerger skipped] RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() am: b30cf4e8cb -s ours am: d1a31c8619 -s ours am: bf4f533ea6 -s ours am: d890d1b428 -s ours am: 8b995bbc72 -s ours am: 6ad8bea7c9 -s ours am: 618272911a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I24ae68dfb0c46cf6d50597586de3a68e32371359
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-08 05:18:33 +00:00
Eric Biggers
64f3b181ab [automerger skipped] RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() am: 50cb0a35c9 -s ours am: 67c4be1e52 -s ours am: 57c5a92514 -s ours am: 3a9f8d7b32 -s ours am: c598a4cf48 -s ours am: 92939c1eb3 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I25ab77dab7356d28eda796e71815cbd529cf859a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-08 05:16:48 +00:00
Eric Biggers
4241da06f6 [automerger skipped] RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() am: 5f07aba150 -s ours am: 733d83d27b -s ours am: aa93927b87 -s ours am: 80ef1e0ff5 -s ours am: 7f97ac5ea7 -s ours am: 4643015447 -s ours am: 35e6c7b3dd -s ours am: d220b79a3f -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Icf950b0ec4b92690df5c93e6cef95aeb54827122
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-08 04:55:36 +00:00
Eric Biggers
d60572e3ed [automerger skipped] RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() am: b30cf4e8cb -s ours am: d1a31c8619 -s ours am: bf4f533ea6 -s ours am: d890d1b428 -s ours am: 8b995bbc72 -s ours am: 936bf45faa -s ours am: 965d046088 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ia76c21ecb40e78b8ca7d02d569a08b2b119d09f8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-08 04:54:40 +00:00
Eric Biggers
57e52a7da8 [automerger skipped] RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() am: 50cb0a35c9 -s ours am: 67c4be1e52 -s ours am: 57c5a92514 -s ours am: 3a9f8d7b32 -s ours am: 95a303ce6d -s ours am: 45e6fbbb81 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ibd1c3d6db0c9353747acd4b9d0172668767009fb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-08 04:53:44 +00:00
Eric Biggers
d220b79a3f [automerger skipped] RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() am: 5f07aba150 -s ours am: 733d83d27b -s ours am: aa93927b87 -s ours am: 80ef1e0ff5 -s ours am: 7f97ac5ea7 -s ours am: 4643015447 -s ours am: 35e6c7b3dd -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ifec3990978057829e349649f96e93d044183ea93
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-08 04:39:08 +00:00
Eric Biggers
965d046088 [automerger skipped] RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() am: b30cf4e8cb -s ours am: d1a31c8619 -s ours am: bf4f533ea6 -s ours am: d890d1b428 -s ours am: 8b995bbc72 -s ours am: 936bf45faa -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie551a7a2186c17a12680a90eba3bd5b47fb743c2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-08 04:38:06 +00:00
Eric Biggers
45e6fbbb81 [automerger skipped] RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() am: 50cb0a35c9 -s ours am: 67c4be1e52 -s ours am: 57c5a92514 -s ours am: 3a9f8d7b32 -s ours am: 95a303ce6d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ifed87fa6fe5e873ced826ac403159cd2f83b429a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-08 04:37:06 +00:00
Eric Biggers
a78f35b23d [automerger skipped] RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() am: 5f07aba150 -s ours am: 733d83d27b -s ours am: aa93927b87 -s ours am: 80ef1e0ff5 -s ours am: 7f97ac5ea7 -s ours am: 4643015447 -s ours am: f050fc11ca -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I401469c715068b6aa8567f2a0cdbc867ff75c226
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-08 04:33:38 +00:00
Eric Biggers
618272911a [automerger skipped] RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() am: b30cf4e8cb -s ours am: d1a31c8619 -s ours am: bf4f533ea6 -s ours am: d890d1b428 -s ours am: 8b995bbc72 -s ours am: 6ad8bea7c9 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ibbb4b3d0f0b0c481101d8c2ff543bbdcb043b485
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-08 04:32:27 +00:00
Eric Biggers
5a04afe7dd [automerger skipped] Merge "RESTRICT AUTOMERGE: Catch exceptions from setLockCredential()" into udc-dev am: dee47fbf68 -s ours 
am skip reason: Merged-In I48b9119c19fb6378b1f88d36433ee4f4c8501d76 with SHA-1 99be30f895 is already in history

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

Change-Id: Ia45f6623331756785d8dc6652705653fbf1175d7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-08 04:31:45 +00:00
Eric Biggers
e10ad67f99 [automerger skipped] RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() am: 8f3ca8daeb -s ours 
am skip reason: Merged-In I48b9119c19fb6378b1f88d36433ee4f4c8501d76 with SHA-1 99be30f895 is already in history

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

Change-Id: I82c5fce418423a5d14050e1157e2d8bb2c15c5e0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-08 04:31:42 +00:00
Eric Biggers
92939c1eb3 [automerger skipped] RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() am: 50cb0a35c9 -s ours am: 67c4be1e52 -s ours am: 57c5a92514 -s ours am: 3a9f8d7b32 -s ours am: c598a4cf48 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id3b7fe96109b59b8fe05c3c7e337b21386fb730b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-08 04:31:20 +00:00
Eric Biggers
dee47fbf68 Merge "RESTRICT AUTOMERGE: Catch exceptions from setLockCredential()" into udc-dev 2023-08-08 04:01:47 +00:00
Eric Biggers
654b36564f [automerger skipped] RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() am: 99be30f895 -s ours am: 7475b96786 -s ours am: 2ce24a1fa9 -s ours am: 355e257668 -s ours am: 419537da17 -s ours am: df35caa539 -s ours am: 97da688143 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I5cb8996362ff68c8339faa13619bef2a406c2d64
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-08 03:54:38 +00:00
Eric Biggers
7989bc077b [automerger skipped] RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() am: 6e92ca106e -s ours am: 81bd8912af -s ours am: e176ec56dc -s ours am: 7f7cd6c38b -s ours am: c1c1acfd67 -s ours am: 8e234af041 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I11ce062a04733567ac21b747e2a6b4cd4492ff5c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-08 03:54:03 +00:00
Eric Biggers
6485d347ff [automerger skipped] RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() am: e0b5a793a1 am: 257bc2eda1 -s ours am: 94573f96bb -s ours am: 488ca4b012 -s ours am: a273ae9983 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ied5324cc4adec9554a3606b44c99e63df6c89d5a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-08 03:53:11 +00:00
Eric Biggers
30d0159217 [automerger skipped] RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() am: 99be30f895 -s ours am: 7475b96786 -s ours am: 2ce24a1fa9 -s ours am: 06c2588645 -s ours am: f20abd9355 -s ours am: c7b0174776 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ibb657b7d14873276db9ab5e4e7fff92ae5b4a426
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-08 03:52:41 +00:00
Eric Biggers
39f4e9b1f6 [automerger skipped] RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() am: 6e92ca106e -s ours am: 81bd8912af -s ours am: bf33df4d79 -s ours am: 92470de980 -s ours am: 27d521036b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I88bba75978b243830ecd992799c451eceae2c247
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-08 03:51:55 +00:00
Eric Biggers
f050fc11ca [automerger skipped] RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() am: 5f07aba150 -s ours am: 733d83d27b -s ours am: aa93927b87 -s ours am: 80ef1e0ff5 -s ours am: 7f97ac5ea7 -s ours am: 4643015447 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Icba8d6c24fe78e0845e450c03f14db18ef61a972
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-08 03:51:13 +00:00
Eric Biggers
37850ca15b [automerger skipped] RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() am: e0b5a793a1 am: 011f39e944 -s ours am: f509f69b79 -s ours am: 7946f730fd -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I57d2693bb346bf053d97bef82dcc27d84fb1b4f6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-08 03:50:26 +00:00
Eric Biggers
6ad8bea7c9 [automerger skipped] RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() am: b30cf4e8cb -s ours am: d1a31c8619 -s ours am: bf4f533ea6 -s ours am: d890d1b428 -s ours am: 8b995bbc72 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic95d9e6da3c8b37898444224aabfe93359305682
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-08 03:50:20 +00:00
Eric Biggers
c598a4cf48 [automerger skipped] RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() am: 50cb0a35c9 -s ours am: 67c4be1e52 -s ours am: 57c5a92514 -s ours am: 3a9f8d7b32 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I197ba0e83ec9cd29abf1899fff9066bf250ac67c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-08 03:48:37 +00:00
Eric Biggers
35e6c7b3dd [automerger skipped] RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() am: 5f07aba150 -s ours am: 733d83d27b -s ours am: aa93927b87 -s ours am: 80ef1e0ff5 -s ours am: 7f97ac5ea7 -s ours am: 4643015447 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I9d337b6fc28cf78f8c5f42071f479b79b17f6eda
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-08 03:47:43 +00:00
Eric Biggers
936bf45faa [automerger skipped] RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() am: b30cf4e8cb -s ours am: d1a31c8619 -s ours am: bf4f533ea6 -s ours am: d890d1b428 -s ours am: 8b995bbc72 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I86862bf5248cace08c299b3e7eb4156e06f19632
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-08 03:47:02 +00:00
Eric Biggers
95a303ce6d [automerger skipped] RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() am: 50cb0a35c9 -s ours am: 67c4be1e52 -s ours am: 57c5a92514 -s ours am: 3a9f8d7b32 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I0f84caa8a112a43910ee87ade9738a16d206f614
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-08 03:46:20 +00:00
Eric Biggers
97da688143 [automerger skipped] RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() am: 99be30f895 -s ours am: 7475b96786 -s ours am: 2ce24a1fa9 -s ours am: 355e257668 -s ours am: 419537da17 -s ours am: df35caa539 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I1b3cc4c37000d035bd8e0ebb20f747c5703c6849
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-08 03:27:46 +00:00