Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Do not post a change in brightness if temporary" into tm-qpr-dev am: da2de7c9ed am: 79fe2faebc

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19396308

Change-Id: I3ec3c293c867f5653b0ad696d849eceb651f7ab6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Fabian Kozynski
2022-08-02 18:57:13 +00:00
committed by Automerger Merge Worker
parent 77ca7cb359 79fe2faebc
commit 00ac18bf04
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
services/core/java/com/android/server/display/DisplayPowerController.java
View File

@@ -1501,6 +1501,8 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call
// Animate the screen brightness when the screen is on or dozing.
// Skip the animation when the screen is off or suspended or transition to/from VR.
boolean brightnessAdjusted = false;
final boolean brightnessIsTemporary =
mAppliedTemporaryBrightness || mAppliedTemporaryAutoBrightnessAdjustment;
if (!mPendingScreenOff) {
if (mSkipScreenOnBrightnessRamp) {
if (state == Display.STATE_ON) {
@@ -1533,8 +1535,6 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call
// level without it being a noticeable jump since any actual content isn't yet visible.
final boolean isDisplayContentVisible =
mColorFadeEnabled && mPowerState.getColorFadeLevel() == 1.0f;
final boolean brightnessIsTemporary =
mAppliedTemporaryBrightness || mAppliedTemporaryAutoBrightnessAdjustment;
// We only want to animate the brightness if it is between 0.0f and 1.0f.
// brightnessState can contain the values -1.0f and NaN, which we do not want to
// animate to. To avoid this, we check the value first.
@@ -1607,7 +1607,8 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call
brightnessAdjusted = saveBrightnessInfo(getScreenBrightnessSetting());
}
if (brightnessAdjusted) {
// Only notify if the brightness adjustment is not temporary (i.e. slider has been released)
if (brightnessAdjusted && !brightnessIsTemporary) {
postBrightnessChangeRunnable();
}