Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 56b4e348 authored by Janis Danisevskis's avatar Janis Danisevskis Committed by android-build-merger
Browse files

Merge "Multi-threaded Keystore" 

am: 2fda3db1

Change-Id: Ib677de5c0f5016051e4e3c28c3a5058f2b31681b
parents 873f417b 2fda3db1

gatekeeperd/gatekeeperd.cpp

+3 −3
Original line number Original line Diff line number Diff line
@@ -25,7 +25,7 @@ 
#include <unistd.h>

#include <unistd.h>

#include <memory>

#include <memory>





#include <android/security/IKeystoreService.h>

#include <android/security/keystore/IKeystoreService.h>

#include <binder/IPCThreadState.h>

#include <binder/IPCThreadState.h>

#include <binder/IServiceManager.h>

#include <binder/IServiceManager.h>

#include <binder/PermissionCache.h>

#include <binder/PermissionCache.h>
@@ -318,8 +318,8 @@ public: 
            // TODO: cache service?

            // TODO: cache service?

            sp<IServiceManager> sm = defaultServiceManager();

            sp<IServiceManager> sm = defaultServiceManager();

            sp<IBinder> binder = sm->getService(String16("android.security.keystore"));

            sp<IBinder> binder = sm->getService(String16("android.security.keystore"));

            sp<security::IKeystoreService> service =

            sp<security::keystore::IKeystoreService> service =

                interface_cast<security::IKeystoreService>(binder);

                    interface_cast<security::keystore::IKeystoreService>(binder);

            if (service != NULL) {

            if (service != NULL) {

                std::vector<uint8_t> auth_token_vector(*auth_token,

                std::vector<uint8_t> auth_token_vector(*auth_token,

                                                       (*auth_token) + *auth_token_length);

                                                       (*auth_token) + *auth_token_length);