PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "RESTRICT AUTOMERGE: Catch exceptions from setLockCredential()" into udc-qpr-dev

Browse Source
This commit is contained in:
Eric Biggers
2023-08-08 00:50:18 +00:00
committed by Android (Google) Code Review
parent c2b7914778 50f93771bc
commit 00885a8cb5
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/com/android/settings/password/SaveAndFinishWorker.java
View File

@@ -107,9 +107,14 @@ public class SaveAndFinishWorker extends Fragment {
@VisibleForTesting @VisibleForTesting
Pair<Boolean, Intent> saveAndVerifyInBackground() { Pair<Boolean, Intent> saveAndVerifyInBackground() {
final int userId = mUserId; final int userId = mUserId;
try {
if (!mUtils.setLockCredential(mChosenCredential, mCurrentCredential, userId)) { if (!mUtils.setLockCredential(mChosenCredential, mCurrentCredential, userId)) {
return Pair.create(false, null); return Pair.create(false, null);
} }
} catch (RuntimeException e) {
Log.e(TAG, "Failed to set lockscreen credential", e);
return Pair.create(false, null);
}
unifyProfileCredentialIfRequested(); unifyProfileCredentialIfRequested();