commit 70adcce6ac7348206dc0c6085d9d3700973c0f47
author Xin Li <delphij@google.com> Tue Jul 09 17:21:16 2019 -0700
committer android-build-merger <android-build-merger@google.com> Tue Jul 09 17:21:16 2019 -0700
tree b52ab1054a3361efdd496d85baf3d36c0e39060e
parent 6660781ddb194efb19089ed10d412c1be7bd856e
parent 1c4860773a8197bdb4575b0cd2f7605ba5576456

[automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.190705.004) into master am: 33080d8b49 -s ours am: 2c1e06e589 -s ours am: 4c373e4563
am: 1c4860773a -s ours
am skip reason: subject contains skip directive

Change-Id: Ib80d9941780b99f6bde1b0c5144bf7630ddb70db

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