Merge "Adjust for small changes in the native keystore interface"

This commit is contained in:
TreeHugger Robot 2017-01-23 17:05:02 +00:00 committed by Android (Google) Code Review
commit e9ad929ec9

View file

@ -304,9 +304,9 @@ public:
sp<IBinder> binder = sm->getService(String16("android.security.keystore"));
sp<IKeystoreService> service = interface_cast<IKeystoreService>(binder);
if (service != NULL) {
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");