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

Commit 0e17ea32 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 am: c65e1ef8 

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



Change-Id: I2fcf7ae6c3d6cb4b23a26f487b66b44ec4ad9b21
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 60e20187 c65e1ef8

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);

    }