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

Commit da856402 authored by Fan Zhang's avatar Fan Zhang Committed by android-build-merger
Browse files

Fix a NPE in confirm lock screen.

am: 8b2baed2

Change-Id: I4c16a428b3409b33815740c734b3390192866a20
parents da414d0a 8b2baed2
Loading
Loading
Loading
Loading
+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()) {