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

Commit c65e1ef8 authored by Kelvin Zhang's avatar Kelvin Zhang Committed by Automerger Merge Worker
Browse files

Check if AIDL service is declared before calling wait am: 781b4ff1 

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2138032



Change-Id: Iebf69fce283b4e57ad9275c2a74bf8cc7b74933d
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 820eda6b 781b4ff1

boot/aidl/client/BootControlClient.cpp

+7 −2
Original line number Diff line number Diff line
@@ -327,9 +327,14 @@ std::unique_ptr<BootControlClient> BootControlClient::WaitForService() { 
    const auto instance_name =

            std::string(::aidl::android::hardware::boot::IBootControl::descriptor) + "/default";



    if (auto module = ::aidl::android::hardware::boot::IBootControl::fromBinder(

    if (AServiceManager_isDeclared(instance_name.c_str())) {

        auto module = ::aidl::android::hardware::boot::IBootControl::fromBinder(

                ndk::SpAIBinder(AServiceManager_waitForService(instance_name.c_str())));

        module != nullptr) {

        if (module == nullptr) {

            LOG(ERROR) << "AIDL " << instance_name

                       << " is declared but waitForService returned nullptr.";

            return nullptr;

        }

        LOG(INFO) << "Using AIDL version of IBootControl";

        return std::make_unique<BootControlClientAidl>(module);

    }