commit 267d803bd00b3b052668e4867afaa16eb206668d
author James Hawkins <jhawkins@google.com> Sat Jan 07 22:28:46 2017 +0000
committer android-build-merger <android-build-merger@google.com> Sat Jan 07 22:28:46 2017 +0000
tree 137cfe0cbed6ade2b56c09a1329e4fe30b8418e0
parent dc07b37f9ffcc7edba3ce1f62b8e8cadcb626eca
parent 1cfcd857fd3b90f72bd40378d76ffef60049ecd6

Merge "bootstat: Log ro.boottime.init timing properties." am: cdd7ec12be am: 449826ad8c
am: 953117a0c9

Change-Id: I24741ee49590f20743a81b5a42b7ab3dc40c902d

gatekeeperd/gatekeeperd.cpp

diff --git a/gatekeeperd/gatekeeperd.cpp b/gatekeeperd/gatekeeperd.cpp
index 4107f55..49a8841 100644
--- a/gatekeeperd/gatekeeperd.cpp
+++ b/gatekeeperd/gatekeeperd.cpp
@@ -166,7 +166,14 @@
                     enrolled_password_handle, enrolled_password_handle_length);
         }
 
-        if (ret == 0) {
+        if (ret == GATEKEEPER_RESPONSE_OK && (*enrolled_password_handle == nullptr ||
+            *enrolled_password_handle_length != sizeof(password_handle_t))) {
+            ret = GATEKEEPER_RESPONSE_ERROR;
+            ALOGE("HAL: password_handle=%p size_of_handle=%" PRIu32 "\n",
+                  *enrolled_password_handle, *enrolled_password_handle_length);
+        }
+
+        if (ret == GATEKEEPER_RESPONSE_OK) {
             gatekeeper::password_handle_t *handle =
                     reinterpret_cast<gatekeeper::password_handle_t *>(*enrolled_password_handle);
             store_sid(uid, handle->user_id);