commit 9e5016af70cf40f3f443196133d711e28297cdde
author Shawn Willden <swillden@google.com> Thu Apr 30 11:12:33 2015 -0600
committer Shawn Willden <swillden@google.com> Thu Apr 30 11:30:49 2015 -0600
tree 198fa8597c67d412fb372c02971d2aab22da821b
parent 87415601e2c26c880129bcfbd518ab04b6820d44

Enable SoftKeymasterDevice logging.

Bug: 20717652
Change-Id: I2397e5cd906d45515a0b2a5591705f458c1aceb0

keystore/keystore.cpp

diff --git a/keystore/keystore.cpp b/keystore/keystore.cpp
index 52f764e..3e3b279 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 @@
     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();