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

RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() am: 50f93771bc

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

Change-Id: I527deaf07af54d6aba582898d29c06c957eff994
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Eric Biggers
2023-08-08 01:16:23 +00:00
committed by Automerger Merge Worker
parent b41875eff3 50f93771bc
commit 62fa3772ed
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();