summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoen Chen <joenchen@google.com>2022-09-19 01:35:28 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2022-09-19 01:35:28 +0000
commitced82308d4fbd60cfaca1b951ca42516bb66df28 (patch)
tree9f32d027820284a7350a3fb79854f85e1b98be90
parentdae6b8eb0695f9e171e49f82646c6e1961779497 (diff)
parent4292810fbe008693390696ae0b9e91e9ffded231 (diff)
downloadnative-ced82308d4fbd60cfaca1b951ca42516bb66df28.tar.gz
Merge "Set mBrightness when needsComposite is zero" into tm-qpr-dev
-rw-r--r--services/surfaceflinger/DisplayDevice.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/services/surfaceflinger/DisplayDevice.cpp b/services/surfaceflinger/DisplayDevice.cpp
index 3bc3ae54b3..c976864be8 100644
--- a/services/surfaceflinger/DisplayDevice.cpp
+++ b/services/surfaceflinger/DisplayDevice.cpp
@@ -334,8 +334,10 @@ void DisplayDevice::stageBrightness(float brightness) {
}
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;