PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
134,074 Commits 1 Branch 0 Tags
ae32c8e8a57066e337e1abcee4c95ddec3b3d42c
Commit Graph

134074 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Eric Biggers
6cb2d5a795 ChooseLockPattern: remove redundant setting of visible pattern default 
Remove the code that set LOCK_PATTERN_VISIBLE to true the first time a
pattern was set, since LOCK_PATTERN_VISIBLE now defaults to true when
unset (ag/22912136).  The explicit defaulting to true was only needed
before because the low-level default value was wrong.

Bug: 270013005
Test: Set a pattern.  Verified that Keyguard uses visible pattern.
      Disabled the "Make pattern visible" option in Settings.  Verified
      that Keyguard doesn't use visible pattern.
Change-Id: I63f29c68f9a508fee0ee2f03f2cca33317fb8a32
Merged-In: I63f29c68f9a508fee0ee2f03f2cca33317fb8a32
(cherry picked from commit 6c3de30086)
 2023-08-09 04:03:18 +00:00
Eric Biggers
08e6612a3d Stop calling LockPatternUtils.setVisiblePasswordEnabled() 
Since the removal of support for Full Disk Encryption (FDE) in favor of
File Based Encryption (FBE), this method has been a no-op.

Bug: 208476087
Test: atest ShowPasswordPreferenceControllerTest.  Note,
      isAvailable_whenNotVisible_isFalse fails both before and after.
Change-Id: Ifb8fc93757366240cf37e4b9a600c2034302919e
Merged-In: Ifb8fc93757366240cf37e4b9a600c2034302919e
(cherry picked from commit bcee8ce1af)
 2023-08-09 04:02:54 +00:00
Treehugger Robot
2200654a7b Merge "Fix crash after confirmLock" into udc-qpr-dev am: 611e43fe05 am: b5195183cc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24351353

Change-Id: Ie9c54fddcb4344051fc492a23bf7102214f10b5f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-09 03:29:46 +00:00
Treehugger Robot
b5195183cc Merge "Fix crash after confirmLock" into udc-qpr-dev am: 611e43fe05 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24351353

Change-Id: I00faa95548e4fba8d1a0618b0064080a609b6f04
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-09 02:46:35 +00:00
Treehugger Robot
611e43fe05 Merge "Fix crash after confirmLock" into udc-qpr-dev 2023-08-09 02:10:49 +00:00
Eric Biggers
eeba25e2f3 [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: 6cc1240b9d -s ours am: af0ddcf8e6 -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: Ia0200da1d6ac0c0831b21881b8613862407981b5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-08 23:51:02 +00:00
Eric Biggers
7cb838d352 [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: 95ee7cd219 -s ours am: 6a369e6269 -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: Icd483a8b7c4a79679ca62de4c0b33f2f3271d184
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-08 23:50:50 +00:00
Eric Biggers
d8bc5be191 [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: 02bbe6b4a5 -s ours am: de352f9e1e -s ours am: 2459ed07d1 -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: Ifbfb2e5cf63dfb64b70037f2450eceafe0d4d927
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-08 23:50:38 +00:00
Automerger Merge Worker
6c61ae4f2a Merge "[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" into udc-d1-dev-plus-aosp am: 01567c311e -s ours am: 26435d8f56 -s ours 
am skip reason: Merged-In I48b9119c19fb6378b1f88d36433ee4f4c8501d76 with SHA-1 8f3ca8daeb is already in history

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

Change-Id: I6048f402a3e61facc184c0615754286c3664297e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-08 23:50:19 +00:00
Eric Biggers
e3b3f05782 [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: 984e4fc571 -s ours am: 88361d7657 -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: I5589376b8603c123eb73d9bec888e45ef18394fe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-08 23:50:13 +00:00
Eric Biggers
af0ddcf8e6 [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: 6cc1240b9d -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: I06f9cd874393b2bb275db1f533bbcfa7fd86f643
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-08 23:09:02 +00:00
Eric Biggers
6a369e6269 [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: 95ee7cd219 -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: Id30304f21a54310427ec15bb64d08a17b0eb597d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-08 23:06:37 +00:00
Eric Biggers
2459ed07d1 [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: 02bbe6b4a5 -s ours am: de352f9e1e -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: I33890fbb26e154621c7a51d6b92d95662a9de66b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-08 23:05:05 +00:00
Automerger Merge Worker
26435d8f56 Merge "[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" into udc-d1-dev-plus-aosp am: 01567c311e -s ours 
am skip reason: Merged-In I48b9119c19fb6378b1f88d36433ee4f4c8501d76 with SHA-1 8f3ca8daeb is already in history

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

Change-Id: Id66ed318123977e68eb1d56c85a342bb24d84d52
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-08 23:04:14 +00:00
Eric Biggers
88361d7657 [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: 984e4fc571 -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: Ic25b4aa9b9b71157583ed862021c031a89c061cb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-08 23:04:09 +00:00
Anvesh Renikindi
d811e2b515 Merge "Remove ExperimentalLifecycleComposeApi" into main 2023-08-08 20:33:33 +00:00
Chun-Ku Lin
b65108ba1b Split the string resource id for non-generic accessibility preference. 
- Keep the accessibility settings strings the same as in U.

Bug: 289425138
Test: manual
Test: atest
Change-Id: Iddbbfe627c93529d2421e153094a30628229c4bc
 2023-08-08 19:17:54 +00:00
Chun-Ku Lin
f8b3da11e7 Remove unused variable 
Bug: N/A
Test: N/A
Change-Id: I1bac8a1745faae89c67fe6d582477807dc4592c5
 2023-08-08 19:17:45 +00:00
Justin McClain
524643a6c8 Merge "Remote authenticator enrollment finish layout." into main 2023-08-08 15:51:39 +00:00
Justin McClain
a3a000426e Remote authenticator enrollment finish layout. 
This flow will be included in Device Unlock settings with the
Fingerprint and Face Unlock.

Bug: b/293905106
Test: atest RemoteAuthEnrollFinishTest
Change-Id: I5d24e23948e508dcff5216cd63eba8d9fc9ec97f
 2023-08-08 14:19:20 +00:00
Tetiana Meronyk
d7a6a7f1ce Merge "Remove toggle "Turn on phone calls & SMS" from User Details of Main user" into main 2023-08-08 14:04:31 +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
Tetiana Meronyk
30ca0fbb3d Remove toggle "Turn on phone calls & SMS" from User Details of Main user 
Admins should not be able to disable phone calls and SMS from the device owner.

Bug: 294846327
Test: atest UserDetailsSettingsTest
Change-Id: Ibb8532379c6e1e22fe45f2acb5191f8f6c7f3b0a
 2023-08-08 09:53:33 +00:00
SongFerng Wang
1901f50dcf Fix NullPointerException of LocalMediaManager 
Bug: LocalMediaManager
Test: build pass

Change-Id: Ib53cb11d28669486573777be992711200a39cd85
 2023-08-08 09:24:46 +00: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
Chaohui Wang
8e2ae547d6 Clean up FeatureFactory.getFeature() 
Bug: 286764889
Test: m Settings
Change-Id: I7e472e6b0ca6b7a735c1b92742ddf06c545176fc
 2023-08-08 08:41:48 +00:00
Chaohui Wang
0062308347 Merge "Fix references to resources for Settings" into main 2023-08-08 08:40:42 +00:00
Eric Biggers
997a731b90 [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: 25a1f8429c -s ours am: 0314166ee4 -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: If4ddf1a3eb1808e1a44c3052bccb323e9b3203a5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-08 07:45:57 +00:00
Eric Biggers
99e0dba2c5 [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: 5b9f246bb3 -s ours am: cb1e1f0404 -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: I3522d496019f5cca65cac897a31b4d38a119bf82
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-08 07:37:18 +00:00
Automerger Merge Worker
33acd4622a Merge "[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: 458d7445a3 -s ours" into udc-qpr-dev-plus-aosp am: ce1dc3611e -s ours 
am skip reason: Merged-In I48b9119c19fb6378b1f88d36433ee4f4c8501d76 with SHA-1 8f3ca8daeb is already in history

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

Change-Id: Ib14994d2d044fec0e1143e80de7cb32bf098312c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-08 07:35:05 +00:00
Eric Biggers
746b5f5f9a [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: 458d7445a3 -s ours am: 1f76ef4687 -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: I0e8ef5aa586d2f719d06a7d46ee15d72362bb3a3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-08 07:34:58 +00:00
Eric Biggers
0314166ee4 [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: 25a1f8429c -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: Iba4d0d965810482555a45adede45a3fcf0d84712
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-08 07:31:52 +00:00
Eric Biggers
c14e7b31e1 [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: 783e16cb2c -s ours am: aa5fe9724c -s ours am: 8ba86452c0 -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: Ia1f6f031300e97824933f228a990009ef6a15074
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-08 07:31:44 +00:00
Eric Biggers
cb1e1f0404 [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: 5b9f246bb3 -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: Ide09bf3a7a57489d0694bbce696b69b8f3ffa860
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-08 07:31:07 +00:00
Eric Biggers
d95d31563c [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: e43fc9f13b -s ours am: 3c604afa64 -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: Ie2e3d39399b6e5ad614cd6619bd25bfa85f350c8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-08 07:30:22 +00:00
Automerger Merge Worker
ce1dc3611e Merge "[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: 458d7445a3 -s ours" into udc-qpr-dev-plus-aosp 2023-08-08 07:30:11 +00:00
Eric Biggers
1f76ef4687 [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: 458d7445a3 -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: I9daf318f05f1158e4f063321a77da300ee01465d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-08 07:29:20 +00:00
Eric Biggers
8ba86452c0 [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: 783e16cb2c -s ours am: aa5fe9724c -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: Iec85c1d28c600cf41942a0ce985f74f7602d647a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-08 07:29:08 +00:00
Eric Biggers
150669dd3d [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: d01ae4c976 -s ours am: 3e42e78caa -s ours am: f1da816701 -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: I5cf22c524e9b22d58ce63b4a5f8859a109f0e5cf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-08 07:21:57 +00:00
Automerger Merge Worker
19d9de9239 Merge "[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: 2b385e7da2 -s ours" into udc-d1-dev-plus-aosp am: 3b26ca583d -s ours am: 6a24fdf87c -s ours 
am skip reason: Merged-In I48b9119c19fb6378b1f88d36433ee4f4c8501d76 with SHA-1 8f3ca8daeb is already in history

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

Change-Id: Ib12d4c0f89573b2e703aafd2c74dd8cf46f3003b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-08 07:15:57 +00:00
Eric Biggers
2b54c0c71d [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: 2b385e7da2 -s ours am: 8a0045b284 -s ours am: 259fdb74ad -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: I9debbb42f2164c023a5c0ecf5e332439dd8b2d5e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-08 07:15:53 +00:00
Eric Biggers
ed44c10835 [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: 61785ffddd -s ours am: 172991be6a -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: I3702fc9492ad01f4570e3f14c9565ed413482a47
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-08 07:13:59 +00:00
Automerger Merge Worker
48496ca00c Merge "[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" into udc-d1-dev-plus-aosp am: 1eb56a1e47 -s ours am: 5a94df0299 -s ours 
am skip reason: Merged-In I48b9119c19fb6378b1f88d36433ee4f4c8501d76 with SHA-1 8f3ca8daeb is already in history

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

Change-Id: I2dd8eb4c8fa418bc1520b127715fc04a4db1fc53
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-08 07:12:59 +00:00
Eric Biggers
dbce69ee3c [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: 5621f2a1fd -s ours am: 37816dee32 -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: Ic5512a7664c808d8c4b3c5dc512dcad3c58efddf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-08 07:12:54 +00:00
Eric Biggers
a8f2733a2d [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: 32ba927770 -s ours am: a837b676c9 -s ours am: f351d2f2d1 -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: I04322890cce9b7dca66ec87832b26a708cb58192
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-08 07:10:31 +00:00
Automerger Merge Worker
9722cc089d Merge changes from topic "am-26c28ebb54a241eea293a13ad6ca0543" into udc-qpr-dev-plus-aosp am: 8bc7f7ea86 -s ours 
am skip reason: Merged-In I48b9119c19fb6378b1f88d36433ee4f4c8501d76 with SHA-1 8f3ca8daeb is already in history

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

Change-Id: I8c3b1bd9144883b68af9c37c322f0d84eb7507bf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-08 07:07:35 +00:00
Automerger Merge Worker
fcacec2eb6 Merge "[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" into udc-d1-dev-plus-aosp am: 2df94229d9 -s ours am: 8b90c3dcd2 -s ours 
am skip reason: Merged-In I48b9119c19fb6378b1f88d36433ee4f4c8501d76 with SHA-1 8f3ca8daeb is already in history

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

Change-Id: I53ffbb39496b71d913a16e7e9efee050ed7c5882
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-08 07:07:29 +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
395583293d [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: 9c22ad2b3c -s ours am: 2c8967d76c -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: I737f03a7166384d4e557b23037b18a73acadc5a2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-08 07:01:18 +00:00
Automerger Merge Worker
9ded4c9e7c Merge "[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: cdf5989035 -s ours" into udc-qpr-dev-plus-aosp am: 384191b983 -s ours 
am skip reason: Merged-In I48b9119c19fb6378b1f88d36433ee4f4c8501d76 with SHA-1 8f3ca8daeb is already in history

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

Change-Id: I96a11e3af6b223faa79f0fd3be9ae6ae485f00be
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-08 06:59:21 +00:00