commit 31428a1f4319a5aa0f7ce350523ca7f70608042d
author nagendra modadugu <ngm@google.com> Mon Apr 02 20:50:44 2018 +0000
committer android-build-merger <android-build-merger@google.com> Mon Apr 02 20:50:44 2018 +0000
tree 292493588da7187624b9a8afdc076c60d7d701c1
parent 5ea2f0e7166aef9f453504306df91152d945098c
parent 7b74f4eb4887b7d8164fe89074a2a291366b8924

Merge "keymaster: provide instance name to getService()" into pi-dev
am: 7b74f4eb48

Change-Id: I54617a7788b7d9a19aee559e372cbee240d51539

keymaster/4.0/support/Keymaster.cpp

diff --git a/keymaster/4.0/support/Keymaster.cpp b/keymaster/4.0/support/Keymaster.cpp
index bf52c47..fac0017 100644
--- a/keymaster/4.0/support/Keymaster.cpp
+++ b/keymaster/4.0/support/Keymaster.cpp
@@ -40,7 +40,7 @@
     serviceManager->listByInterface(descriptor, [&](const hidl_vec<hidl_string>& names) {
         for (auto& name : names) {
             if (name == "default") foundDefault = true;
-            auto device = Wrapper::WrappedIKeymasterDevice::getService();
+            auto device = Wrapper::WrappedIKeymasterDevice::getService(name);
             CHECK(device) << "Failed to get service for " << descriptor << " with interface name "
                           << name;
             result.push_back(std::unique_ptr<Keymaster>(new Wrapper(device, name)));