| commit | 4aff3d53efc552aa30e25bf366bcb6e956d8b0e3 | [log] [tgz] |
|---|---|---|
| author | Andrew Zeng <zenga@google.com> | Thu Mar 16 23:03:02 2017 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Thu Mar 16 23:03:06 2017 +0000 |
| tree | 45ff4532da041e3ba55117fb3ca0684783b65a74 | |
| parent | c1a593902601c85e5c95f0eee39980fcfcad7447 [diff] | |
| parent | 750563ee508e3ad9af6a70ccc669c070f892cfcb [diff] |
Merge "Fix NPE in LockSettingsService." into cw-f-dev
diff --git a/services/core/java/com/android/server/LockSettingsService.java b/services/core/java/com/android/server/LockSettingsService.java index fbcb62a..3c529ba 100644 --- a/services/core/java/com/android/server/LockSettingsService.java +++ b/services/core/java/com/android/server/LockSettingsService.java
@@ -1398,7 +1398,7 @@ return VerifyCredentialResponse.OK; } - if (TextUtils.isEmpty(credential)) { + if (storedHash == null || TextUtils.isEmpty(credential)) { return VerifyCredentialResponse.ERROR; }