commit cb9267dc53cb715c09ef276562dbe88b0d999a8d
author Janis Danisevskis <jdanis@google.com> Tue Dec 19 16:27:52 2017 -0800
committer Janis Danisevskis <jdanis@google.com> Wed Dec 27 16:38:09 2017 -0800
tree e0e391613c93947c019e02b85bea7e89688777e4
parent 3506d336f6f36250e4d400610a2a6994c83314c9

Add wrappedKeyImport to keystore service

Bug: 63931634
Test: pending
Change-Id: I9e8301379f737499a994ac299b448361c2066c49

keystore/key_store_service.h

diff --git a/keystore/key_store_service.h b/keystore/key_store_service.h
index 16d7397..fec44ec 100644
--- a/keystore/key_store_service.h
+++ b/keystore/key_store_service.h
@@ -160,6 +160,12 @@
                     ::android::security::keymaster::KeymasterCertificateChain* chain,
                     int32_t* _aidl_return) override;
     ::android::binder::Status onDeviceOffBody(int32_t* _aidl_return) override;
+    ::android::binder::Status importWrappedKey(
+        const ::android::String16& wrappedKeyAlias, const ::std::vector<uint8_t>& wrappedKey,
+        const ::android::String16& wrappingKeyAlias, const ::std::vector<uint8_t>& maskingKey,
+        const ::android::security::keymaster::KeymasterArguments& params, int64_t rootSid,
+        int64_t fingerprintSid, ::android::security::keymaster::KeyCharacteristics* characteristics,
+        int32_t* _aidl_return) override;
 
   private:
     static const int32_t UID_SELF = -1;