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

Commit fa58ead2 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Check AServiceManager_isDeclared before AServiceManager_getService"

parents 642929f8 32e1c70f

gatekeeperd/gatekeeperd.cpp

+7 −3
Original line number Diff line number Diff line
@@ -63,9 +63,13 @@ constexpr const char gatekeeperServiceName[] = "android.hardware.gatekeeper.IGat 


GateKeeperProxy::GateKeeperProxy() {

    clear_state_if_needed_done = false;

    hw_device = IGatekeeper::getService();

    ::ndk::SpAIBinder ks2Binder(AServiceManager_getService(gatekeeperServiceName));

    if (AServiceManager_isDeclared(gatekeeperServiceName)) {

        ::ndk::SpAIBinder ks2Binder(AServiceManager_waitForService(gatekeeperServiceName));

        aidl_hw_device = AidlIGatekeeper::fromBinder(ks2Binder);

    }

    if (!aidl_hw_device) {

        hw_device = IGatekeeper::getService();

    }

    is_running_gsi = android::base::GetBoolProperty(android::gsi::kGsiBootedProp, false);



    if (!aidl_hw_device && !hw_device) {