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

Treehugger Robot · android-build-merge-worker-robot · commit 0c31d77364e7 · 2025-02-27T19:50:24.000-08:00
Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/3505711 Change-Id: I703b4fbc738a677301e20cf0312d2d5ac5e142da Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/services/surfaceflinger/CompositionEngine/src/ClientCompositionRequestCache.cpp b/services/surfaceflinger/CompositionEngine/src/ClientCompositionRequestCache.cpp
@@ -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) {

Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,8 @@ inline bool equalIgnoringSource(const renderengine::LayerSettings& lhs,`
`38`	`38`	`lhs.disableBlending == rhs.disableBlending && lhs.shadow == rhs.shadow &&`
`39`	`39`	`lhs.backgroundBlurRadius == rhs.backgroundBlurRadius &&`
`40`	`40`	`lhs.stretchEffect == rhs.stretchEffect &&`
`41`		`- lhs.edgeExtensionEffect == rhs.edgeExtensionEffect;`
	`41`	`+ lhs.edgeExtensionEffect == rhs.edgeExtensionEffect &&`
	`42`	`+ lhs.whitePointNits == rhs.whitePointNits;`
`42`	`43`	`}`
`43`	`44`
`44`	`45`	`inline bool equalIgnoringBuffer(const renderengine::Buffer& lhs, const renderengine::Buffer& rhs) {`