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

Commit 94ffd669 authored by Eric Biggers's avatar Eric Biggers Committed by Android (Google) Code Review
Browse files

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

parents d56eb426 423c0e0d

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

+7 −2
Original line number Diff line number Diff line
@@ -1048,8 +1048,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
@@ -909,8 +909,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();

            }