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

Commit 24bc094e authored by Cody Heiner's avatar Cody Heiner Committed by Android (Google) Code Review
Browse files

Merge "Change getService (deprecated) to waitForService"

parents 8b823bb6 bcfa7faa

services/surfaceflinger/SurfaceFlinger.cpp

+2 −2
Original line number Diff line number Diff line
@@ -687,7 +687,7 @@ void SurfaceFlinger::bootFinished() { 


    // wait patiently for the window manager death

    const String16 name("window");

    mWindowManager = defaultServiceManager()->getService(name);

    mWindowManager = defaultServiceManager()->waitForService(name);

    if (mWindowManager != 0) {

        mWindowManager->linkToDeath(sp<IBinder::DeathRecipient>::fromExisting(this));

    }
@@ -701,7 +701,7 @@ void SurfaceFlinger::bootFinished() { 
    LOG_EVENT_LONG(LOGTAG_SF_STOP_BOOTANIM,

                   ns2ms(systemTime(SYSTEM_TIME_MONOTONIC)));



    sp<IBinder> input(defaultServiceManager()->getService(String16("inputflinger")));

    sp<IBinder> input(defaultServiceManager()->waitForService(String16("inputflinger")));



    static_cast<void>(mScheduler->schedule([=]() FTL_FAKE_GUARD(kMainThreadContext) {

        if (input == nullptr) {

services/surfaceflinger/tests/IPC_test.cpp

+1 −1
Original line number Diff line number Diff line
@@ -289,7 +289,7 @@ sp<IIPCTest> IPCTest::initRemoteService() { 
            IPCThreadState::self()->joinThreadPool();

            [&]() { exit(0); }();

        }

        sp<IBinder> binder = defaultServiceManager()->getService(serviceName);

        sp<IBinder> binder = defaultServiceManager()->waitForService(serviceName);

        remote = interface_cast<IIPCTest>(binder);

        remote->setDeathToken(mDeathRecipient);

    }