Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
halo
system_security
Commits
2764f867
Commit
2764f867
authored
10 years ago
by
Shawn Willden
Browse files
Options
Download
Email Patches
Plain Diff
Enable SoftKeymasterDevice logging.
Bug: 20717652 Change-Id: I2397e5cd906d45515a0b2a5591705f458c1aceb0
parent
47a79ffa
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
1 deletion
+6
-1
keystore/keystore.cpp
keystore/keystore.cpp
+6
-1
No files found.
keystore/keystore.cpp
View file @
2764f867
...
...
@@ -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
();
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment