commit b2b7ff6153e3568b8a0fece0064b994a9a186019
author Adam Langley <agl@google.com> Sat Oct 03 00:19:06 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Sat Oct 03 00:19:06 2015 +0000
tree aebb189d11acf5a0f1fcba7f684ef7789ed55ea0
parent eaef4ba62b8fc90420bcf56a14dec34e27da3778
parent 358bd1156745a470f87dacfd509d2876e7ef6327

am 358bd115: Prepare for BoringSSL update.

* commit '358bd1156745a470f87dacfd509d2876e7ef6327':
  Prepare for BoringSSL update.

keystore/Android.mk

diff --git a/keystore/Android.mk b/keystore/Android.mk
index e18b2d8..3babd1d 100644
--- a/keystore/Android.mk
+++ b/keystore/Android.mk
@@ -37,6 +37,7 @@
 	libkeymaster1
 LOCAL_MODULE := keystore
 LOCAL_MODULE_TAGS := optional
+LOCAL_INIT_RC := keystore.rc
 LOCAL_C_INCLUES := system/keymaster/
 LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
 include $(BUILD_EXECUTABLE)

keystore/keystore.rc

diff --git a/keystore/keystore.rc b/keystore/keystore.rc
new file mode 100644
index 0000000..df48412
--- /dev/null
+++ b/keystore/keystore.rc
@@ -0,0 +1,4 @@
+service keystore /system/bin/keystore /data/misc/keystore
+    class main
+    user keystore
+    group keystore drmrpc

keystore/operation.cpp

diff --git a/keystore/operation.cpp b/keystore/operation.cpp
index 4a71922..3b381c4 100644
--- a/keystore/operation.cpp
+++ b/keystore/operation.cpp
@@ -31,7 +31,7 @@
                                        keymaster_key_characteristics_t* characteristics,
                                        bool pruneable) {
     sp<IBinder> token = new BBinder();
-    mMap[token] = std::move(Operation(handle, keyid, purpose, dev, characteristics, appToken));
+    mMap[token] = Operation(handle, keyid, purpose, dev, characteristics, appToken);
     if (pruneable) {
         mLru.push_back(token);
     }