commit 3eb59befbc9baac7703f50ffe4df7a870357c69f
author Jim Miller <jaggies@google.com> Fri May 29 00:29:06 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri May 29 00:29:06 2015 +0000
tree 1fe2caaf210697b5638adb0a5457dfe6535f0b86
parent 08e4bfdb2f605aa6bcb0f2a39ce955f516596b51
parent 20291933bf05d735c7544cf096a3795eda9b43d3

am 53d181dc: Merge "Fix 64-bit build error" into mnc-dev

* commit '53d181dcb40f3af83379e9d19e03c0026b90bbf1':
  Fix 64-bit build error

fingerprintd/FingerprintDaemonProxy.cpp

diff --git a/fingerprintd/FingerprintDaemonProxy.cpp b/fingerprintd/FingerprintDaemonProxy.cpp
index 2091a2c..4f35520 100644
--- a/fingerprintd/FingerprintDaemonProxy.cpp
+++ b/fingerprintd/FingerprintDaemonProxy.cpp
@@ -123,7 +123,7 @@
         int32_t timeout) {
     ALOG(LOG_VERBOSE, LOG_TAG, "enroll(gid=%d, timeout=%d)\n", groupId, timeout);
     if (tokenSize != sizeof(hw_auth_token_t) ) {
-        ALOG(LOG_VERBOSE, LOG_TAG, "enroll() : invalid token size %d\n", tokenSize);
+        ALOG(LOG_VERBOSE, LOG_TAG, "enroll() : invalid token size %" PRId64 "\n", tokenSize);
         return -1;
     }
     const hw_auth_token_t* authToken = reinterpret_cast<const hw_auth_token_t*>(token);
@@ -171,7 +171,7 @@
     char path_name[PATH_MAX];
     memcpy(path_name, path, pathlen);
     path_name[pathlen] = '\0';
-    ALOG(LOG_VERBOSE, LOG_TAG, "setActiveGroup(%d, %s, %d)", groupId, path_name, pathlen);
+    ALOG(LOG_VERBOSE, LOG_TAG, "setActiveGroup(%d, %s, %" PRId64 ")", groupId, path_name, pathlen);
     return mDevice->set_active_group(mDevice, groupId, path_name);
     return -1;
 }