diff options
| author | Scott Lobdell <slobdell@google.com> | 2021-04-07 05:35:55 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2021-04-07 05:35:55 +0000 |
| commit | ec6cfacad7283c60a33cfefacf5031247a2f81dc (patch) | |
| tree | 5b473e86fc8ab0afc2241b6ac25875b25fa354bd /gatekeeperd/gatekeeperd.cpp | |
| parent | 79aff2b0a0653fcafaf9099ad60075f2903e8de1 (diff) | |
| parent | 268fff7088f0ab311c2de902178054ce40a42243 (diff) | |
Merge "Merge SP1A.210329.001" into s-keystone-qcom-dev
Diffstat (limited to 'gatekeeperd/gatekeeperd.cpp')
| -rw-r--r-- | gatekeeperd/gatekeeperd.cpp | 19 |
1 files changed, 1 insertions, 18 deletions
diff --git a/gatekeeperd/gatekeeperd.cpp b/gatekeeperd/gatekeeperd.cpp index f9c0cddb4..8792c8352 100644 --- a/gatekeeperd/gatekeeperd.cpp +++ b/gatekeeperd/gatekeeperd.cpp @@ -29,13 +29,11 @@ #include <android-base/properties.h> #include <android/binder_ibinder.h> #include <android/binder_manager.h> -#include <android/security/keystore/IKeystoreService.h> #include <binder/IPCThreadState.h> #include <binder/IServiceManager.h> #include <binder/PermissionCache.h> #include <gatekeeper/password_handle.h> // for password_handle_t #include <hardware/hw_auth_token.h> -#include <keystore/keystore_return_types.h> #include <libgsi/libgsi.h> #include <log/log.h> #include <utils/String16.h> @@ -303,7 +301,7 @@ class GateKeeperProxy : public BnGateKeeperService { if (gkResponse->payload().size() != 0) { // try to connect to IKeystoreAuthorization AIDL service first. AIBinder* authzAIBinder = - AServiceManager_checkService("android.security.authorization"); + AServiceManager_getService("android.security.authorization"); ::ndk::SpAIBinder authzBinder(authzAIBinder); auto authzService = IKeystoreAuthorization::fromBinder(authzBinder); if (authzService) { @@ -328,21 +326,6 @@ class GateKeeperProxy : public BnGateKeeperService { LOG(ERROR) << "Failure in sending AuthToken to AuthorizationService."; return GK_ERROR; } - } - sp<IServiceManager> sm = defaultServiceManager(); - - sp<IBinder> binder = sm->getService(String16("android.security.keystore")); - sp<security::keystore::IKeystoreService> service = - interface_cast<security::keystore::IKeystoreService>(binder); - - if (service) { - int result = 0; - auto binder_result = service->addAuthToken(gkResponse->payload(), &result); - if (!binder_result.isOk() || - !keystore::KeyStoreServiceReturnCode(result).isOk()) { - LOG(ERROR) << "Failure sending auth token to KeyStore: " << result; - return GK_ERROR; - } } else { LOG(ERROR) << "Cannot deliver auth token. Unable to communicate with " "Keystore."; |