Merge "Fix NPE in LockSettingsService." into cw-f-dev

am: 4aff3d53ef Change-Id: I17880622c489df79eeea5116b3afe3c462b06554
2017-03-16 23:22:05 +00:00
parent 4b39c15da0 4aff3d53ef
commit a01e2212c8
1 changed files with 1 additions and 1 deletions
--- 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;
        }