commit e653c93db15400048605b49d74a21ec2c139afec
author Roshan Pius <rpius@google.com> Wed Mar 29 10:08:47 2017 -0700
committer Roshan Pius <rpius@google.com> Thu Mar 30 13:04:46 2017 -0700
tree f81c100bb7ec2a3a41a0da523fcb8f6d0db2e578
parent bf7fc8df768203bb2812fd1e28b8dab23560e381

keystore: Run Wifi keystore HAL in keystore daemon

The wifi keystore hal will run in the context of the main keystore
daemon.

Also,
Use the new IKeystore::tryGetService() for retrieveing the HAL service.

Bug: 34603782
Test: Able to connect to wifi passpoint networks.

Change-Id: I1436ea83166e5ad17372d98b0fd699c0dd732a11

keystore-engine/keystore_backend_hidl.cpp

diff --git a/keystore-engine/keystore_backend_hidl.cpp b/keystore-engine/keystore_backend_hidl.cpp
index 37ad9a1..80a3601 100644
--- a/keystore-engine/keystore_backend_hidl.cpp
+++ b/keystore-engine/keystore_backend_hidl.cpp
@@ -37,7 +37,7 @@
         return -1;
     }
 
-    sp<IKeystore> service = IKeystore::getService();
+    sp<IKeystore> service = IKeystore::tryGetService();
     if (service == NULL) {
         ALOGE("could not contact keystore HAL");
         return -1;
@@ -64,7 +64,7 @@
         return -1;
     }
 
-    sp<IKeystore> service = IKeystore::getService();
+    sp<IKeystore> service = IKeystore::tryGetService();
     if (service == NULL) {
         ALOGE("could not contact keystore HAL");
         return -1;