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_main.cpp

diff --git a/keystore/keystore_main.cpp b/keystore/keystore_main.cpp
index c05d142..409ac83 100644
--- a/keystore/keystore_main.cpp
+++ b/keystore/keystore_main.cpp
@@ -18,7 +18,7 @@
 
 #include <android-base/logging.h>
 #include <android/hidl/manager/1.1/IServiceManager.h>
-#include <android/security/IKeystoreService.h>
+#include <android/security/keystore/IKeystoreService.h>
 #include <android/system/wifi/keystore/1.0/IKeystore.h>
 #include <binder/IPCThreadState.h>
 #include <binder/IServiceManager.h>