Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Unverified Commit bb0582e8 authored Dec 07, 2023 by Michael Bestas Committed by Michael Bestas Dec 10, 2023

Revert "RESTRICT AUTOMERGE: Catch exceptions from setLockCredential()"

This reverts commit fc5e4e45.

Reason for revert: Conflicts with QPR1.

Change-Id: Ia2ff18694b91c650de0ffb13c4d1db5c08aa4080

parent 9bbd0af7

src/com/android/settings/password/ChooseLockPassword.java

+2 −7

Original line number	Diff line number	Diff line
		@@ -1103,13 +1103,8 @@ public class ChooseLockPassword extends SettingsActivity {

		@Override
		protected Pair<Boolean, Intent> saveAndVerifyInBackground() {
		boolean success;
		try {
		success = mUtils.setLockCredential(mChosenPassword, mCurrentCredential, mUserId);
		} catch (RuntimeException e) {
		Log.e(TAG, "Failed to set lockscreen credential", e);
		success = false;
		}
		final boolean success = mUtils.setLockCredential(
		mChosenPassword, mCurrentCredential, mUserId);
		if (success) {
		unifyProfileCredentialIfRequested();
		}

src/com/android/settings/password/ChooseLockPattern.java

+2 −7

Original line number	Diff line number	Diff line
		@@ -898,13 +898,8 @@ public class ChooseLockPattern extends SettingsActivity {
		@Override
		protected Pair<Boolean, Intent> saveAndVerifyInBackground() {
		final int userId = mUserId;
		boolean success;
		try {
		success = mUtils.setLockCredential(mChosenPattern, mCurrentCredential, userId);
		} catch (RuntimeException e) {
		Log.e(TAG, "Failed to set lockscreen credential", e);
		success = false;
		}
		final boolean success = mUtils.setLockCredential(mChosenPattern, mCurrentCredential,
		userId);
		if (success) {
		unifyProfileCredentialIfRequested();
		}