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

Commit dc057e52 authored by Chavi Weingarten's avatar Chavi Weingarten Committed by android-build-team Robot
Browse files

resolve merge conflicts of cae2ee03 to rvc-dev 

Change-Id: I906ae5bed4b340817a52f7968276dea035f2e65a
Fixes: 169256435
Merged-In: I4d87e90793a88a646aaa1ae5806f118f1ae51e30
(cherry picked from commit 60f3ab27)
parent f76b5eb5

services/surfaceflinger/SurfaceFlinger.cpp

+9 −8
Original line number Diff line number Diff line
@@ -600,13 +600,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);

    }



    if (mVrFlinger) {

      mVrFlinger->OnBootFinished();
@@ -621,7 +614,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;