commit a47afa94395c0c0102d68a911a11236639a3a0b7
author Janis Danisevskis <jdanis@google.com> Fri Jan 20 13:50:10 2017 +0000
committer Janis Danisevskis <jdanis@google.com> Fri Jan 20 13:51:53 2017 +0000
tree 78bfdd705c06e999fc1c5a58b7bcc243c907aba1
parent 3e84bebc0e1be12393c2ae0330ae16abae581d5e

Adjust for minor changes in the native keystore client interface

Test: boot and use fingerprint to get an auth token
Change-Id: Ib5089457f31d17b73842e5aa4c73e61b590e6fbd

biometrics/fingerprint/2.1/default/BiometricsFingerprint.cpp

diff --git a/biometrics/fingerprint/2.1/default/BiometricsFingerprint.cpp b/biometrics/fingerprint/2.1/default/BiometricsFingerprint.cpp
index eb28e46..516cd00 100644
--- a/biometrics/fingerprint/2.1/default/BiometricsFingerprint.cpp
+++ b/biometrics/fingerprint/2.1/default/BiometricsFingerprint.cpp
@@ -25,6 +25,8 @@
 #include <hardware/fingerprint.h>
 #include "BiometricsFingerprint.h"
 
+#include <inttypes.h>
+
 namespace android {
 namespace hardware {
 namespace biometrics {
@@ -245,12 +247,12 @@
     if (auth_token != nullptr && auth_token_length > 0) {
         // TODO: cache service?
         sp<IServiceManager> sm = android::defaultServiceManager();
-        sp<IBinder> binder = sm->getService(String16("android.security.keystore"));
+        sp<::android::IBinder> binder = sm->getService(String16("android.security.keystore"));
         sp<IKeystoreService> service = interface_cast<IKeystoreService>(binder);
         if (service != nullptr) {
-            status_t ret = service->addAuthToken(auth_token, auth_token_length);
-            if (ret != ResponseCode::NO_ERROR) {
-                ALOGE("Falure sending auth token to KeyStore: %d", ret);
+            auto ret = service->addAuthToken(auth_token, auth_token_length);
+            if (!ret.isOk()) {
+                ALOGE("Failure sending auth token to KeyStore: %" PRId32, int32_t(ret));
             }
         } else {
             ALOGE("Unable to communicate with KeyStore");