Merge "Fix NPE in LockSettingsService." into cw-f-dev am: 4aff3d53ef

am: a01e2212c8 Change-Id: Id333403e3a989e233a97760b716055b3abd186d6
2017-03-16 23:40:09 +00:00
parent 8ade276115 a01e2212c8
commit d4e88e2642
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;
        }