diff options
| author | 2025-02-27 18:35:53 -0800 | |
|---|---|---|
| committer | 2025-02-27 18:35:53 -0800 | |
| commit | 0bb6a26f36218ee6b9dfa909c15b8dc522e2077c (patch) | |
| tree | 3ca94696cd7ad3ec1493dba32a910719ace2d8bd | |
| parent | 818783174fe4053e5932a8dfb723333d74e88f6a (diff) | |
| parent | 7eb3839fad051b198be358fa03af0d92fa48d4e5 (diff) | |
Merge "Fix the issue of screen flashing when adjusting ambient light when playing HDR video." into main am: 7eb3839fad
Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/3505711
Change-Id: Ibac0cdaea1e01938b68cd69241c809459e76a111
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | services/surfaceflinger/CompositionEngine/src/ClientCompositionRequestCache.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/services/surfaceflinger/CompositionEngine/src/ClientCompositionRequestCache.cpp b/services/surfaceflinger/CompositionEngine/src/ClientCompositionRequestCache.cpp index d9018bc3ab..dc841952c9 100644 --- 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) { |