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

Commit 4d22e4a2 authored by Bill Yi's avatar Bill Yi
Browse files

Merge RQ1A.210205.004 to aosp-master - DO NOT MERGE 

Merged-In: I775a1697595929aaf1258d48f45676ec18065cff
Merged-In: I8a85cb252e7f8977bf8e86651005d74e7b4c2e8c
Change-Id: If4a2f2b8f8b9bcd144cfef37be1a78906cc14d2f
parents 0a14f06a 9f1c0e6c

services/surfaceflinger/SurfaceFlinger.cpp

+9 −8
Original line number Diff line number Diff line
@@ -596,13 +596,6 @@ void SurfaceFlinger::bootFinished() 
    if (mWindowManager != 0) {

        mWindowManager->linkToDeath(static_cast<IBinder::DeathRecipient*>(this));

    }

    sp<IBinder> input(defaultServiceManager()->getService(

            String16("inputflinger")));

    if (input == nullptr) {

        ALOGE("Failed to link to input service");

    } else {

        mInputFlinger = interface_cast<IInputFlinger>(input);

    }



    // stop boot animation

    // formerly we would just kill the process, but we now ask it to exit so it
@@ -613,7 +606,15 @@ void SurfaceFlinger::bootFinished() 
    LOG_EVENT_LONG(LOGTAG_SF_STOP_BOOTANIM,

                   ns2ms(systemTime(SYSTEM_TIME_MONOTONIC)));



    static_cast<void>(schedule([this] {

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



    static_cast<void>(schedule([=] {

        if (input == nullptr) {

            ALOGE("Failed to link to input service");

        } else {

            mInputFlinger = interface_cast<IInputFlinger>(input);

        }



        readPersistentProperties();

        mPowerAdvisor.onBootFinished();

        mBootStage = BootStage::FINISHED;