commit 6119551ca1b35d36c9d8acafdeaaa2312a63b649
author David Anderson <dvander@google.com> Thu Jun 20 18:43:00 2019 -0700
committer android-build-merger <android-build-merger@google.com> Thu Jun 20 18:43:00 2019 -0700
tree 1760586fe43216e6250a0137318c994f7d47f1c4
parent 3d8f66fd66e26b94a035eb82a93aacdf17361607
parent b8150885e39298bde35838e5afbffa0fee265ba2

Merge "Block and wait for /dev/block/loop<N> to appear in case it was created asynchronously." am: ee5eb39169 am: 5973b8cf00 am: 4d0dadb629
am: b8150885e3

Change-Id: I9d5b0b46d11ba4b75073812b9ff71b061a694d34

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;
 };