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

diff --git a/keystore/KeyStore.cpp b/keystore/KeyStore.cpp
index 8c4844f..7530243 100644
--- a/keystore/KeyStore.cpp
+++ b/keystore/KeyStore.cpp
@@ -28,7 +28,7 @@
 
 #include <android-base/scopeguard.h>
 #include <android/hardware/keymaster/3.0/IKeymasterDevice.h>
-#include <android/security/IKeystoreService.h>
+#include <android/security/keystore/IKeystoreService.h>
 #include <log/log_event_list.h>
 
 #include <private/android_logger.h>