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

Commit 5fcd603b authored by David Drysdale's avatar David Drysdale Committed by Automerger Merge Worker
Browse files

Merge "KeyMint: don't mix Binder and std shared pointers" am: a86af7c9 

Original change: https://android-review.googlesource.com/c/platform/system/core/+/1873559

Change-Id: I9391cbbd581c6e1068e42d96bdb6784e99d9d338
parents 9d400637 a86af7c9

trusty/keymaster/keymint/service.cpp

+1 −1
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ using aidl::android::hardware::security::sharedsecret::trusty::TrustySharedSecre 


template <typename T, class... Args>

std::shared_ptr<T> addService(Args&&... args) {

    std::shared_ptr<T> service = std::make_shared<T>(std::forward<Args>(args)...);

    std::shared_ptr<T> service = ndk::SharedRefBase::make<T>(std::forward<Args>(args)...);

    auto instanceName = std::string(T::descriptor) + "/default";

    LOG(ERROR) << "Adding service instance: " << instanceName;

    auto status = AServiceManager_addService(service->asBinder().get(), instanceName.c_str());