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

Commit ee065fe0 authored by Sandeep Dhavale's avatar Sandeep Dhavale Committed by Gerrit Code Review
Browse files

Merge "Fastboot: Use AServiceManager_waitForService instead of AServiceManager_getService"

parents 12090297 63928c31

fastboot/device/fastboot_device.cpp

+8 −5
Original line number Diff line number Diff line
@@ -70,12 +70,15 @@ std::shared_ptr<aidl::android::hardware::fastboot::IFastboot> get_fastboot_servi 
    using HidlFastboot = android::hardware::fastboot::V1_1::IFastboot;

    using aidl::android::hardware::fastboot::FastbootShim;

    auto service_name = IFastboot::descriptor + "/default"s;

    ndk::SpAIBinder binder(AServiceManager_getService(service_name.c_str()));

    if (AServiceManager_isDeclared(service_name.c_str())) {

        ndk::SpAIBinder binder(AServiceManager_waitForService(service_name.c_str()));

        std::shared_ptr<IFastboot> fastboot = IFastboot::fromBinder(binder);

        if (fastboot != nullptr) {

        LOG(INFO) << "Using AIDL fastboot service";

            LOG(INFO) << "Found and using AIDL fastboot service";

            return fastboot;

        }

        LOG(WARNING) << "AIDL fastboot service is declared, but it cannot be retrieved.";

    }

    LOG(INFO) << "Unable to get AIDL fastboot service, trying HIDL...";

    android::sp<HidlFastboot> hidl_fastboot = HidlFastboot::getService();

    if (hidl_fastboot != nullptr) {