From 9c36c919457fe2ccd6757620122d35069e26bf8d Mon Sep 17 00:00:00 2001 From: nagendra modadugu Date: Fri, 30 Mar 2018 17:07:55 -0700 Subject: [PATCH] keymaster: provide instance name to getService() Bug: 38430282 Test: VtsHalKeymasterV3_0TargetTest pass with exception of (AesEcbWithUserId, RsaAttestation, EcAttestation) which are expected failures. Change-Id: I48e7195f512190deb608f1a69783c92254eef1aa --- keymaster/4.0/support/Keymaster.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keymaster/4.0/support/Keymaster.cpp b/keymaster/4.0/support/Keymaster.cpp index bf52c47c78..fac0017474 100644 --- a/keymaster/4.0/support/Keymaster.cpp +++ b/keymaster/4.0/support/Keymaster.cpp @@ -40,7 +40,7 @@ std::vector> enumerateDevices( serviceManager->listByInterface(descriptor, [&](const hidl_vec& 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(new Wrapper(device, name)));