Fix a NPE in confirm lock screen.

am: 8b2baed2be Change-Id: I4c16a428b3409b33815740c734b3390192866a20
2016-10-06 20:49:10 +00:00
parent da414d0afe 8b2baed2be
commit da856402f4
1 changed files with 6 additions and 2 deletions
--- a/src/com/android/settings/ConfirmLockPassword.java
+++ b/src/com/android/settings/ConfirmLockPassword.java
@@ -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()) {