| commit | 75fd4b82c1f01d28792a821a60a302fdb427e8a0 | [log] [tgz] |
|---|---|---|
| author | Joen Chen <joenchen@google.com> | Mon Sep 19 02:48:12 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Sep 19 02:48:12 2022 +0000 |
| tree | e420bd4e81557878faddb07cf98aee45ab6fafc9 | |
| parent | aefa36596805784523c9ae3aca101c7e2f7ba707 [diff] | |
| parent | f2b19cdcde6c3fd03413a76fd8b776a9d0ccbb03 [diff] |
Merge "Set mBrightness when needsComposite is zero" into tm-qpr-dev am: ced82308d4 am: f2b19cdcde Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/19868745 Change-Id: Ief2d039b9c01bf95fc02b9e1bba404818f679ccf Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/services/surfaceflinger/DisplayDevice.cpp b/services/surfaceflinger/DisplayDevice.cpp index 029e449..b823e06 100644 --- a/services/surfaceflinger/DisplayDevice.cpp +++ b/services/surfaceflinger/DisplayDevice.cpp
@@ -312,8 +312,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;