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

Commit d50ed0b9 authored by Leon Scroggins's avatar Leon Scroggins Committed by Automerger Merge Worker
Browse files

Merge "Skip renderCachedSets if the Output is not enabled" into udc-dev am: 9402f4fa 

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



Change-Id: I78456aebf8cd6722451bcc7254e6ff42fff552db
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 7d276893 9402f4fa

services/surfaceflinger/CompositionEngine/src/Output.cpp

+4 −3
Original line number Diff line number Diff line
@@ -1574,9 +1574,10 @@ void Output::postFramebuffer() { 
}



void Output::renderCachedSets(const CompositionRefreshArgs& refreshArgs) {

    if (mPlanner) {

        mPlanner->renderCachedSets(getState(), refreshArgs.scheduledFrameTime,

                                   getState().usesDeviceComposition || getSkipColorTransform());

    const auto& outputState = getState();

    if (mPlanner && outputState.isEnabled) {

        mPlanner->renderCachedSets(outputState, refreshArgs.scheduledFrameTime,

                                   outputState.usesDeviceComposition || getSkipColorTransform());

    }

}