From 750563ee508e3ad9af6a70ccc669c070f892cfcb Mon Sep 17 00:00:00 2001
From: Andrew Zeng <zenga@google.com>
Date: Fri, 10 Mar 2017 15:14:08 -0800
Subject: [PATCH] Fix NPE in LockSettingsService.

Bug: 33789922

Change-Id: Iecdedd8d73d9f749f15a64131cc894d9f92de9d1
---
 services/core/java/com/android/server/LockSettingsService.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/services/core/java/com/android/server/LockSettingsService.java b/services/core/java/com/android/server/LockSettingsService.java
index fbcb62a3a8afc..3c529bae50d88 100644
--- a/services/core/java/com/android/server/LockSettingsService.java
+++ b/services/core/java/com/android/server/LockSettingsService.java
@@ -1398,7 +1398,7 @@ public class LockSettingsService extends ILockSettings.Stub {
             return VerifyCredentialResponse.OK;
         }
 
-        if (TextUtils.isEmpty(credential)) {
+        if (storedHash == null || TextUtils.isEmpty(credential)) {
             return VerifyCredentialResponse.ERROR;
         }