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

Commit 0c31d773 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix the issue of screen flashing when adjusting ambient light when... 

Merge "Fix the issue of screen flashing when adjusting ambient light when playing HDR video." into main am: 7eb3839f am: 0bb6a26f

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



Change-Id: I703b4fbc738a677301e20cf0312d2d5ac5e142da
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 71bff482 0bb6a26f

services/surfaceflinger/CompositionEngine/src/ClientCompositionRequestCache.cpp

+2 −1
Original line number Diff line number Diff line
@@ -38,7 +38,8 @@ inline bool equalIgnoringSource(const renderengine::LayerSettings& lhs, 
            lhs.disableBlending == rhs.disableBlending && lhs.shadow == rhs.shadow &&

            lhs.backgroundBlurRadius == rhs.backgroundBlurRadius &&

            lhs.stretchEffect == rhs.stretchEffect &&

            lhs.edgeExtensionEffect == rhs.edgeExtensionEffect;

            lhs.edgeExtensionEffect == rhs.edgeExtensionEffect &&

            lhs.whitePointNits == rhs.whitePointNits;

}



inline bool equalIgnoringBuffer(const renderengine::Buffer& lhs, const renderengine::Buffer& rhs) {