commit ced82308d4fbd60cfaca1b951ca42516bb66df28
author Joen Chen <joenchen@google.com> Mon Sep 19 01:35:28 2022 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Sep 19 01:35:28 2022 +0000
tree 9f32d027820284a7350a3fb79854f85e1b98be90
parent dae6b8eb0695f9e171e49f82646c6e1961779497
parent 4292810fbe008693390696ae0b9e91e9ffded231

Merge "Set mBrightness when needsComposite is zero" into tm-qpr-dev

services/surfaceflinger/DisplayDevice.cpp

diff --git a/services/surfaceflinger/DisplayDevice.cpp b/services/surfaceflinger/DisplayDevice.cpp
index 3bc3ae5..c976864 100644
--- a/services/surfaceflinger/DisplayDevice.cpp
+++ b/services/surfaceflinger/DisplayDevice.cpp
@@ -334,8 +334,10 @@
 }
 
 void DisplayDevice::persistBrightness(bool needsComposite) {
-    if (needsComposite && mStagedBrightness && mBrightness != *mStagedBrightness) {
-        getCompositionDisplay()->setNextBrightness(*mStagedBrightness);
+    if (mStagedBrightness && mBrightness != *mStagedBrightness) {
+        if (needsComposite) {
+            getCompositionDisplay()->setNextBrightness(*mStagedBrightness);
+        }
         mBrightness = *mStagedBrightness;
     }
     mStagedBrightness = std::nullopt;