summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTreeHugger Robot2018-05-24 18:19:06 -0500
committerAndroid (Google) Code Review2018-05-24 18:19:06 -0500
commitd5a5888c60c9fc829faf2fd9e3c89f0d5190f2c7 (patch)
tree82ffb8aecedd081e770158c56942738424c767b4
parent375ea55d58b2c457ce98e41de645b713f6ec54e7 (diff)
parent8d815f659df25efd81856d1ea8f7d1826a9c51bc (diff)
downloadplatform-hardware-interfaces-d5a5888c60c9fc829faf2fd9e3c89f0d5190f2c7.tar.gz
platform-hardware-interfaces-d5a5888c60c9fc829faf2fd9e3c89f0d5190f2c7.tar.xz
platform-hardware-interfaces-d5a5888c60c9fc829faf2fd9e3c89f0d5190f2c7.zip
Merge "Fix default keymaster so it doesn't start an extra thread." into pi-dev
-rw-r--r--keymaster/4.0/default/service.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/keymaster/4.0/default/service.cpp b/keymaster/4.0/default/service.cpp
index cfb960a5..fdcc6ba9 100644
--- a/keymaster/4.0/default/service.cpp
+++ b/keymaster/4.0/default/service.cpp
@@ -24,6 +24,7 @@
24using android::hardware::keymaster::V4_0::SecurityLevel; 24using android::hardware::keymaster::V4_0::SecurityLevel;
25 25
26int main() { 26int main() {
27 ::android::hardware::configureRpcThreadpool(1, true /* willJoinThreadpool */);
27 auto keymaster = ::keymaster::V4_0::ng::CreateKeymasterDevice(SecurityLevel::SOFTWARE); 28 auto keymaster = ::keymaster::V4_0::ng::CreateKeymasterDevice(SecurityLevel::SOFTWARE);
28 auto status = keymaster->registerAsService(); 29 auto status = keymaster->registerAsService();
29 if (status != android::OK) { 30 if (status != android::OK) {