commit 5807c327255d354696ba9ce5e39fa253e693548c
author Paul Lawrence <paullawrence@google.com> Mon Aug 26 23:21:19 2019 -0700
committer android-build-merger <android-build-merger@google.com> Mon Aug 26 23:21:19 2019 -0700
tree ba57607f9c38dfd100179004865f84ddedc8d4ff
parent fc345f1c6434c9150e693a8973992200c826c8d4
parent 0f3c17b50ff5d5005bf488f9029c5a761285101f

Merge "Fix crash in mainline" am: 3a0d51f6b7 am: 6c5944f899 am: 9cd7fdc882 am: 06bd0c427f
am: 0f3c17b50f

Change-Id: I5425ca6ef3f65fbbec7b6d105054d9abf9d39c09

Android.bp

diff --git a/Android.bp b/Android.bp
index 5b2e600..f6e5c13 100644
--- a/Android.bp
+++ b/Android.bp
@@ -231,6 +231,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;
 };