Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 45d0bd1e authored by Yeabkal Wubshit's avatar Yeabkal Wubshit Committed by Android (Google) Code Review
Browse files

Merge "Minor optimization: avoid unneeded computation in DisplayStateController" into main

parents 2b981f4a e76ba1de

services/core/java/com/android/server/display/DisplayPowerController.java

+3 −2
Original line number Diff line number Diff line
@@ -1540,12 +1540,13 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call 
                performScreenOffTransition = true;

                break;

            case DisplayPowerRequest.POLICY_DOZE:

                if (mPowerRequest.dozeScreenState != Display.STATE_UNKNOWN) {

                if (mDozeStateOverride != Display.STATE_UNKNOWN) {

                    state = mDozeStateOverride;

                } else if (mPowerRequest.dozeScreenState != Display.STATE_UNKNOWN) {

                    state = mPowerRequest.dozeScreenState;

                } else {

                    state = Display.STATE_DOZE;

                }

                state = mDozeStateOverride == Display.STATE_UNKNOWN ? state : mDozeStateOverride;

                if (!mAllowAutoBrightnessWhileDozingConfig) {

                    brightnessState = mPowerRequest.dozeScreenBrightness;

                    mBrightnessReasonTemp.setReason(BrightnessReason.REASON_DOZE);

services/core/java/com/android/server/display/state/DisplayStateController.java

+3 −2
Original line number Diff line number Diff line
@@ -61,12 +61,13 @@ public class DisplayStateController { 
                mPerformScreenOffTransition = true;

                break;

            case DisplayManagerInternal.DisplayPowerRequest.POLICY_DOZE:

                if (displayPowerRequest.dozeScreenState != Display.STATE_UNKNOWN) {

                if (mDozeStateOverride != Display.STATE_UNKNOWN) {

                    state = mDozeStateOverride;

                } else if (displayPowerRequest.dozeScreenState != Display.STATE_UNKNOWN) {

                    state = displayPowerRequest.dozeScreenState;

                } else {

                    state = Display.STATE_DOZE;

                }

                state = mDozeStateOverride == Display.STATE_UNKNOWN ? state : mDozeStateOverride;

                break;

            case DisplayManagerInternal.DisplayPowerRequest.POLICY_DIM:

            case DisplayManagerInternal.DisplayPowerRequest.POLICY_BRIGHT: