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

Commit 8f3ca8da authored by Eric Biggers's avatar Eric Biggers
Browse files

RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() 

When LockPatternUtils#setLockCredential() fails, it can either return
false or throw an exception.  Catch the exception and treat it the same
way as a false return value, to prevent crashing com.android.settings.

Bug: 253043065
Test: Tried setting lockscreen credential while in secure FRP mode using
      smartlock setup activity launched by intent via adb.  Verified
      that com.android.settings no longer crashes due to the exception
      from LockPatternUtils#setLockCredential().
Change-Id: I48b9119c19fb6378b1f88d36433ee4f4c8501d76
(cherry picked from commit 05f1eff1)
(moved change into ChooseLockPassword.java and ChooseLockPattern.java,
 which are merged into SaveAndFinishWorker.java on udc-qpr-dev and main)
Merged-In: I48b9119c19fb6378b1f88d36433ee4f4c8501d76
parent 8d6051a0

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

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


        @Override

        protected Pair<Boolean, Intent> saveAndVerifyInBackground() {

            final boolean success = mUtils.setLockCredential(

                    mChosenPassword, mCurrentCredential, mUserId);

            boolean success;

            try {

                success = mUtils.setLockCredential(mChosenPassword, mCurrentCredential, mUserId);

            } catch (RuntimeException e) {

                Log.e(TAG, "Failed to set lockscreen credential", e);

                success = false;

            }

            if (success) {

                unifyProfileCredentialIfRequested();

            }

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

+7 −2
Original line number Diff line number Diff line
@@ -898,8 +898,13 @@ public class ChooseLockPattern extends SettingsActivity { 
        @Override

        protected Pair<Boolean, Intent> saveAndVerifyInBackground() {

            final int userId = mUserId;

            final boolean success = mUtils.setLockCredential(mChosenPattern, mCurrentCredential,

                    userId);

            boolean success;

            try {

                success = mUtils.setLockCredential(mChosenPattern, mCurrentCredential, userId);

            } catch (RuntimeException e) {

                Log.e(TAG, "Failed to set lockscreen credential", e);

                success = false;

            }

            if (success) {

                unifyProfileCredentialIfRequested();

            }