commit | 1afb826c883c3fbbadb94a1ccdedcb4cf33a9e9f | [log] [tgz] |
---|---|---|
author | Treehugger Robot <treehugger-gerrit@google.com> | Tue Feb 14 19:36:32 2017 +0000 |
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Tue Feb 14 19:36:33 2017 +0000 |
tree | b1eff9336d5545642b728bea877a6855b8a47e63 | |
parent | 856761d5b01da66c09dbc6cb339b5345bfe0a945 [diff] | |
parent | 65d56eb10ba09a4ab036a485143afa2315225e12 [diff] |
Merge "Fix bugs regarding KeyStore::isHardwareBacked always returning true."
diff --git a/soft_keymaster_device.cpp b/soft_keymaster_device.cpp index eddbc5d..c7605f4 100644 --- a/soft_keymaster_device.cpp +++ b/soft_keymaster_device.cpp
@@ -269,6 +269,7 @@ // keymaster2 APIs memset(&km2_device_, 0, sizeof(km2_device_)); + km2_device_.flags = flags; km2_device_.context = this; km2_device_.common.tag = HARDWARE_DEVICE_TAG;