commit 76494931ac572aedd5e4658c07d798dfe8e2a335
author Alex Deymo <deymo@google.com> Thu Jan 12 21:37:48 2017 +0000
committer android-build-merger <android-build-merger@google.com> Thu Jan 12 21:37:48 2017 +0000
tree 23f0688396ead89116ca9ad903a3647387a22a22
parent 2c3a2456d98b60ca897208a0799b9dd1cff0be94
parent 6330ec56c7f50cff06b2fccfee2afe09a6decc9a

Remove "_static" and "_host" suffix from libext4_utils. am: 705353ae27 am: c8f55cc5ca
am: 8e3e4effaa

Change-Id: Ie55012b07cb84ba642ff017ca6bcf74a304dde37

gatekeeperd/gatekeeperd.cpp

diff --git a/gatekeeperd/gatekeeperd.cpp b/gatekeeperd/gatekeeperd.cpp
index d4a92e5..96bda07 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);