commit bb01c051151a01d6cb4f819a3ced1c029dc3be07
author Paul Lawrence <paullawrence@google.com> Tue Aug 27 09:29:36 2019 -0700
committer android-build-merger <android-build-merger@google.com> Tue Aug 27 09:29:36 2019 -0700
tree e8e335ae55812f9e8486d77e98b791be7924eeec
parent 5807c327255d354696ba9ce5e39fa253e693548c
parent 68094b8d1364eadf9244ae2eda18e6379399d632

Merge "Fix ext4/metadata/udc issue" am: ee867be1f1 am: 3096e373be am: 4b1dad6065 am: d0282ac35d
am: 68094b8d13

Change-Id: If612ac21b99f16c1bc64fadb3c9e6e0336c6e536

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