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

Commit 1bdc9c3d authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 10242133 from d4668571 to udc-release 

Change-Id: I34610c158b1f7d70c12a2d10ce5025a6eec52cc3
parents 8a1e19a9 d4668571

services/inputflinger/dispatcher/InputDispatcher.cpp

+7 −0
Original line number Diff line number Diff line
@@ -6700,6 +6700,13 @@ void InputDispatcher::onWindowInfosChanged(const gui::WindowInfosUpdate& update) 
        for (const auto& [displayId, handles] : handlesPerDisplay) {

            setInputWindowsLocked(handles, displayId);

        }



        if (update.vsyncId < mWindowInfosVsyncId) {

            ALOGE("Received out of order window infos update. Last update vsync id: %" PRId64

                  ", current update vsync id: %" PRId64,

                  mWindowInfosVsyncId, update.vsyncId);

        }

        mWindowInfosVsyncId = update.vsyncId;

    }

    // Wake up poll loop since it may need to make new input dispatching choices.

    mLooper->wake();

services/inputflinger/dispatcher/InputDispatcher.h

+2 −0
Original line number Diff line number Diff line
@@ -204,6 +204,8 @@ private: 


    const IdGenerator mIdGenerator;



    int64_t mWindowInfosVsyncId GUARDED_BY(mLock);



    // With each iteration, InputDispatcher nominally processes one queued event,

    // a timeout, or a response from an input consumer.

    // This method should only be called on the input dispatcher's own thread.

services/surfaceflinger/DisplayHardware/PowerAdvisor.cpp

+4 −1
Original line number Diff line number Diff line
@@ -223,7 +223,7 @@ void PowerAdvisor::updateTargetWorkDuration(Duration targetDuration) { 
}



void PowerAdvisor::reportActualWorkDuration() {

    if (!mBootFinished || !usePowerHintSession()) {

    if (!mBootFinished || !sUseReportActualDuration || !usePowerHintSession()) {

        ALOGV("Actual work duration power hint cannot be sent, skipping");

        return;

    }
@@ -564,6 +564,9 @@ const Duration PowerAdvisor::sTargetSafetyMargin = std::chrono::microseconds( 
        base::GetIntProperty<int64_t>("debug.sf.hint_margin_us",

                                      ticks<std::micro>(PowerAdvisor::kDefaultTargetSafetyMargin)));



const bool PowerAdvisor::sUseReportActualDuration =

        base::GetBoolProperty(std::string("debug.adpf.use_report_actual_duration"), true);



power::PowerHalController& PowerAdvisor::getPowerHal() {

    static std::once_flag halFlag;

    std::call_once(halFlag, [this] { mPowerHal->init(); });

services/surfaceflinger/DisplayHardware/PowerAdvisor.h

+3 −0
Original line number Diff line number Diff line
@@ -269,6 +269,9 @@ private: 
    static const Duration sTargetSafetyMargin;

    static constexpr const Duration kDefaultTargetSafetyMargin{1ms};



    // Whether we should send reportActualWorkDuration calls

    static const bool sUseReportActualDuration;



    // How long we expect hwc to run after the present call until it waits for the fence

    static constexpr const Duration kFenceWaitStartDelayValidated{150us};

    static constexpr const Duration kFenceWaitStartDelaySkippedValidate{250us};

services/surfaceflinger/SurfaceFlinger.cpp

+4 −1
Original line number Diff line number Diff line
@@ -2485,7 +2485,10 @@ bool SurfaceFlinger::commit(TimePoint frameTime, VsyncId vsyncId, TimePoint expe 


        mPowerAdvisor->setFrameDelay(frameDelay);

        mPowerAdvisor->setTotalFrameTargetWorkDuration(idealSfWorkDuration);

        mPowerAdvisor->updateTargetWorkDuration(vsyncPeriod);



        const auto& display = FTL_FAKE_GUARD(mStateLock, getDefaultDisplayDeviceLocked()).get();

        const Period idealVsyncPeriod = display->getActiveMode().fps.getPeriod();

        mPowerAdvisor->updateTargetWorkDuration(idealVsyncPeriod);

    }



    if (mRefreshRateOverlaySpinner) {