commit b1b35cf5d858466ba13eec8aee62b88990e15403
author Paul Lawrence <paullawrence@google.com> Thu Jun 27 17:39:42 2019 -0700
committer android-build-merger <android-build-merger@google.com> Thu Jun 27 17:39:42 2019 -0700
tree b52ab1054a3361efdd496d85baf3d36c0e39060e
parent 7e52fcff1ebc8cf530728b96abb9df10769cde0e
parent d233d202babb9cf96eecb4418a6bd216ec01ef11

[automerger skipped] Merge "Add property to prevent commit for Vts test" am: 5bcfb5bf45 am: 3507d68556 -s ours am: d5fe5cfcb5 -s ours
am: d233d202ba -s ours
am skip reason: change_id I20441964dbc7b6ad5b445fa17a1374c1282bbbd8 with SHA1 3f1ce062d5 is in history

Change-Id: I54fdd0db5490c80810aac4dca04b42d18b9b44ee

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