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

Commit fa7b4252 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Merge cherrypicks of [8738218, 8738219, 8738140, 8736270, 8736271, 8736272,... 

Merge cherrypicks of [8738218, 8738219, 8738140, 8736270, 8736271, 8736272, 8732114, 8738495, 8738319, 8736743, 8738320, 8738496] into qt-release

Change-Id: Ifa7fcd336a982ffb454544253f701374a34e072b
parents eeae637e 40deef5c

libs/gui/SurfaceComposerClient.cpp

+3 −0
Original line number Diff line number Diff line
@@ -365,6 +365,9 @@ SurfaceComposerClient::Transaction& SurfaceComposerClient::Transaction::merge(Tr 
    mContainsBuffer = other.mContainsBuffer;

    other.mContainsBuffer = false;



    mEarlyWakeup = mEarlyWakeup || other.mEarlyWakeup;

    other.mEarlyWakeup = false;



    return *this;

}

services/surfaceflinger/SurfaceFlinger.cpp

+8 −3
Original line number Diff line number Diff line
@@ -353,6 +353,11 @@ SurfaceFlinger::SurfaceFlinger(Factory& factory) : SurfaceFlinger(factory, SkipI 
    mPropagateBackpressure = !atoi(value);

    ALOGI_IF(!mPropagateBackpressure, "Disabling backpressure propagation");



    property_get("debug.sf.enable_gl_backpressure", value, "0");

    mPropagateBackpressureClientComposition = atoi(value);

    ALOGI_IF(mPropagateBackpressureClientComposition,

             "Enabling backpressure propagation for Client Composition");



    property_get("debug.sf.enable_hwc_vds", value, "0");

    mUseHwcVirtualDisplays = atoi(value);

    ALOGI_IF(mUseHwcVirtualDisplays, "Enabling HWC virtual displays");
@@ -1670,9 +1675,9 @@ void SurfaceFlinger::onMessageReceived(int32_t what) NO_THREAD_SAFETY_ANALYSIS { 
                break;

            }



            // For now, only propagate backpressure when missing a hwc frame.

            if (hwcFrameMissed && !gpuFrameMissed) {

                if (mPropagateBackpressure) {

            if (frameMissed && mPropagateBackpressure) {

                if ((hwcFrameMissed && !gpuFrameMissed) ||

                    mPropagateBackpressureClientComposition) {

                    signalLayerUpdate();

                    break;

                }

services/surfaceflinger/SurfaceFlinger.h

+1 −0
Original line number Diff line number Diff line
@@ -1003,6 +1003,7 @@ private: 
    volatile nsecs_t mDebugInTransaction = 0;

    bool mForceFullDamage = false;

    bool mPropagateBackpressure = true;

    bool mPropagateBackpressureClientComposition = false;

    std::unique_ptr<SurfaceInterceptor> mInterceptor;

    SurfaceTracing mTracing{*this};

    bool mTracingEnabled = false;