Fix a NPE in confirm lock screen. am: 8b2baed2be

am: da856402f4 Change-Id: Ia13e941b8766ae128bf31f224656f7e862e0b059
2016-10-06 21:54:30 +00:00
parent 049d2b88f6 da856402f4
commit ac053b6179
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()) {