commit bb6cabdaa19489f0a3c54acf35c56ffe59da9820
author Rob Barnes <robbarnes@google.com> Thu Oct 04 17:10:37 2018 -0600
committer Janis Danisevskis <jdanis@google.com> Wed Nov 14 14:01:45 2018 -0800
tree 0840ed5a9b9cc39a15fdd73059c308d68b958fa9
parent 81c7e390e7abe4dfdc8ea8ae88c03259ea4d92be

Multi-threaded keystore

This patches changes the keystore to use the asychronous api model for
begin, update, finish, and abort.

Also removes unused class KeystoreArguments (aidl and implementation).

Test: Keystore CTS tests
Bug: 111443219

Change-Id: Icc6def9ff6dbe32193272d7d015079a006ebc430

keystore/keystore_get.cpp

diff --git a/keystore/keystore_get.cpp b/keystore/keystore_get.cpp
index fec36c4..a6f8755 100644
--- a/keystore/keystore_get.cpp
+++ b/keystore/keystore_get.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include <android/security/IKeystoreService.h>
+#include <android/security/keystore/IKeystoreService.h>
 #include <binder/IServiceManager.h>
 
 #include <keystore/keystore_get.h>
@@ -26,8 +26,8 @@
 ssize_t keystore_get(const char* key, size_t keyLength, uint8_t** value) {
     sp<IServiceManager> sm = defaultServiceManager();
     sp<IBinder> binder = sm->getService(String16("android.security.keystore"));
-    sp<android::security::IKeystoreService> service =
-        interface_cast<android::security::IKeystoreService>(binder);
+    sp<android::security::keystore::IKeystoreService> service =
+        interface_cast<android::security::keystore::IKeystoreService>(binder);
 
     if (service == nullptr) {
         return -1;