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

Commit daf10122 authored by Chia-I Wu's avatar Chia-I Wu
Browse files

resolve merge conflicts of 7918a122 to master 

BUG: None
Test: I solemnly swear I tested this conflict resolution.
Change-Id: Ibc545a95f24c6aaf24e8ea3d8148835ed98834da
parents 5c7813c7 bbb44464

services/surfaceflinger/SurfaceFlinger.cpp

+4 −3
Original line number Diff line number Diff line
@@ -2904,7 +2904,8 @@ bool SurfaceFlinger::doComposeSurfaces(const sp<const DisplayDevice>& displayDev 
            getRenderEngine().setupColorTransform(mDrawingState.colorMatrix);

        }



        needsLegacyColorMatrix = (mDisplayColorSetting == DisplayColorSetting::ENHANCED &&

        needsLegacyColorMatrix =

            (displayDevice->getActiveRenderIntent() == RenderIntent::ENHANCE &&

             outputDataspace != Dataspace::UNKNOWN &&

             outputDataspace != Dataspace::SRGB);