Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b40644c7 authored by nagendra modadugu's avatar nagendra modadugu Committed by android-build-merger
Browse files

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

am: 31428a1f

Change-Id: I628847c8d896abc8e6f0e0a439320148cd47ef28
parents 1cb8908c 31428a1f

keymaster/4.0/support/Keymaster.cpp

+1 −1
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ std::vector<std::unique_ptr<Keymaster>> enumerateDevices( 
    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)));