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

Commit 1931d67b authored by Chavi Weingarten's avatar Chavi Weingarten Committed by Automerger Merge Worker
Browse files

resolve merge conflicts of cae2ee03 to rvc-dev... 

resolve merge conflicts of cae2ee03 to rvc-dev am: 60f3ab27 am: 338022f3

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/13186612

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iada6af56ba8b1676513ff0804f576b84be022d06
parents 082832d9 338022f3

services/surfaceflinger/SurfaceFlinger.cpp

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

    if (mWindowManager != 0) {

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

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

    }





    if (mVrFlinger) {

    if (mVrFlinger) {

      mVrFlinger->OnBootFinished();

      mVrFlinger->OnBootFinished();
@@ -621,7 +614,15 @@ void SurfaceFlinger::bootFinished() 
    LOG_EVENT_LONG(LOGTAG_SF_STOP_BOOTANIM,

    LOG_EVENT_LONG(LOGTAG_SF_STOP_BOOTANIM,

                   ns2ms(systemTime(SYSTEM_TIME_MONOTONIC)));

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

        readPersistentProperties();

        mPowerAdvisor.onBootFinished();

        mPowerAdvisor.onBootFinished();

        mBootStage = BootStage::FINISHED;

        mBootStage = BootStage::FINISHED;