commit 3d8f66fd66e26b94a035eb82a93aacdf17361607
author Tri Vo <trong@google.com> Thu Jun 20 17:47:02 2019 -0700
committer android-build-merger <android-build-merger@google.com> Thu Jun 20 17:47:02 2019 -0700
tree 7f4de12979a604213fdeb0e795a4c67f74c23362
parent 8fc710cc6abffc6425e6bdadcbefe88240e76349
parent 1a3b759a952b1cde773cd4acae28592ff0447782

Merge "vold: use RAII wake locks" am: 798aa303da am: 56c6681ba8 am: c3d9197784
am: 1a3b759a95

Change-Id: Ibb6db27d179e6dc64adc0add7ad163d2a30ec979

Android.bp

diff --git a/Android.bp b/Android.bp
index f565732..a4cbd88 100644
--- a/Android.bp
+++ b/Android.bp
@@ -230,6 +230,7 @@
         "libhidlbase",
         "libhwbinder",
         "libkeymaster4support",
+        "libutils",
     ],
 }
 

Keymaster.h

diff --git a/Keymaster.h b/Keymaster.h
index 42a2b5d..9a0616d 100644
--- a/Keymaster.h
+++ b/Keymaster.h
@@ -115,7 +115,7 @@
     bool isSecure();
 
   private:
-    std::unique_ptr<KmDevice> mDevice;
+    sp<KmDevice> mDevice;
     DISALLOW_COPY_AND_ASSIGN(Keymaster);
     static bool hmacKeyGenerated;
 };