diff options
| author | Shawn Willden <swillden@google.com> | 2015-04-30 11:12:33 -0600 |
|---|---|---|
| committer | Shawn Willden <swillden@google.com> | 2015-04-30 17:37:57 +0000 |
| commit | 0400675b20e36b976ec13b63e290e6d5d19bf654 (patch) | |
| tree | 1785b56fba51fb7b0b169de1238be07dc5417745 | |
| parent | 9fd05a9a6299e9688c8fcf755516ea254868d187 (diff) | |
| download | security-0400675b20e36b976ec13b63e290e6d5d19bf654.tar.gz | |
Enable SoftKeymasterDevice logging.
Bug: 20717652
Change-Id: I2397e5cd906d45515a0b2a5591705f458c1aceb0
(cherry picked from commit 2764f8672d22ccfb4ed588ce567ef093c7d3e013)
| -rw-r--r-- | keystore/keystore.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/keystore/keystore.cpp b/keystore/keystore.cpp index 24c137aa..b89ac820 100644 --- a/keystore/keystore.cpp +++ b/keystore/keystore.cpp @@ -43,8 +43,9 @@ #include <hardware/keymaster0.h> -#include <keymaster/softkeymaster.h> #include <keymaster/soft_keymaster_device.h> +#include <keymaster/soft_keymaster_logger.h> +#include <keymaster/softkeymaster.h> #include <UniquePtr.h> #include <utils/String8.h> @@ -129,6 +130,10 @@ out: return rc; } +// softkeymaster_logger appears not to be used in keystore, but it installs itself as the +// logger used by SoftKeymasterDevice. +static keymaster::SoftKeymasterLogger softkeymaster_logger; + static int fallback_keymaster_device_initialize(keymaster1_device_t** dev) { keymaster::SoftKeymasterDevice* softkeymaster = new keymaster::SoftKeymasterDevice(); |