commit b8550a0929286bd8b91135c2beea1f61c01a441f
author Shawn Willden <swillden@google.com> Thu Feb 23 11:06:05 2017 -0700
committer Shawn Willden <swillden@google.com> Fri Mar 24 20:02:41 2017 -0600
tree 8fcf2013e1509df4a6e781e7c15396b2643d22bb
parent 30038a601c5d3b7dede6d206aac5b544a10cf4cb

Add digest support and implementation name to getHardwareFeatures

Test: Manual
Change-Id: Iee20528e8d4f3931164aa988e11bfe71be4f56dc

keystore/keystore.cpp

diff --git a/keystore/keystore.cpp b/keystore/keystore.cpp
index f7695c5..32667e0 100644
--- a/keystore/keystore.cpp
+++ b/keystore/keystore.cpp
@@ -481,13 +481,15 @@
 }
 
 bool KeyStore::isHardwareBacked(const android::String16& /*keyType*/) const {
+    using ::android::hardware::hidl_string;
     if (mDevice == NULL) {
         ALOGW("can't get keymaster device");
         return false;
     }
 
     bool isSecure = false;
-    auto hidlcb = [&] (bool _isSecure, bool, bool, bool) {
+    auto hidlcb = [&] (bool _isSecure, bool, bool, bool, bool, const hidl_string&,
+                       const hidl_string&) {
         isSecure = _isSecure;
     };
     auto rc = mDevice->getHardwareFeatures(hidlcb);