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

Commit 6cea122b authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Fix a NPE in confirm lock screen." into nyc-mr1-dev

parents bd7adb93 8b2baed2

src/com/android/settings/ConfirmLockPassword.java

+6 −2
Original line number Diff line number Diff line
@@ -320,11 +320,15 @@ public class ConfirmLockPassword extends ConfirmDeviceCredentialBaseActivity { 
                return;

            }



            mPasswordEntryInputDisabler.setInputEnabled(false);



            final String pin = mPasswordEntry.getText().toString();

            if (TextUtils.isEmpty(pin)) {

                return;

            }



            mPasswordEntryInputDisabler.setInputEnabled(false);

            final boolean verifyChallenge = getActivity().getIntent().getBooleanExtra(

                    ChooseLockSettingsHelper.EXTRA_KEY_HAS_CHALLENGE, false);



            Intent intent = new Intent();

            if (verifyChallenge)  {

                if (isInternalActivity()) {