From 774e1d8443fa551bdcfb54de2fd478db42e70a16 Mon Sep 17 00:00:00 2001
From: Fan Zhang <zhfan@google.com>
Date: Mon, 3 Oct 2016 09:05:55 -0700
Subject: [PATCH] Fix a NPE in confirm lock screen.

Change-Id: Id280cd1b8781678540c9ea281b3186edd04d61f9
Fixes: 31895774
Test: make RunSettingsRoboTests
Test: manually enter correct/wrong/empty password/pin in confirm lock UI
---
 src/com/android/settings/ConfirmLockPassword.java | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/com/android/settings/ConfirmLockPassword.java b/src/com/android/settings/ConfirmLockPassword.java
index 228f4a9e4b4..52144497967 100644
--- a/src/com/android/settings/ConfirmLockPassword.java
+++ b/src/com/android/settings/ConfirmLockPassword.java
@@ -319,11 +319,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()) {