summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2022-09-19 23:21:08 +0000
committerAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2022-09-19 23:21:08 +0000
commit92353557c9c75f23d69f5383bdee23e48664141d (patch)
tree9f32d027820284a7350a3fb79854f85e1b98be90
parentc0e74ed7f3a7545d8145a5e8e54f1f4353245699 (diff)
parentced82308d4fbd60cfaca1b951ca42516bb66df28 (diff)
downloadnative-92353557c9c75f23d69f5383bdee23e48664141d.tar.gz
Snap for 9080545 from ced82308d4fbd60cfaca1b951ca42516bb66df28 to tm-d4-release
Change-Id: I7923bbc7c13110db81fc63e696c9a4530259f27a
-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;