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

Commit 26cfea55 authored by Fiona Campbell's avatar Fiona Campbell Committed by Automerger Merge Worker
Browse files

Merge "Use config.xml as brightness default fallback." into sc-dev am: 2188e522 

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

Change-Id: Iab43d0ce99d321ed1a43c38884d0e8951c4823ec
parents 3045d184 2188e522

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

+1 −1
Original line number Diff line number Diff line
@@ -422,7 +422,7 @@ public class DisplayDeviceConfig { 
            if (configBrightnessDefault != null) {

                mBrightnessDefault = configBrightnessDefault.floatValue();

            } else {

                mBrightnessDefault = BRIGHTNESS_DEFAULT;

                loadBrightnessDefaultFromConfigXml();

            }

        }

    }

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

+5 −1
Original line number Diff line number Diff line
@@ -1362,6 +1362,9 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call 
                    + mBrightnessReasonTemp.toString(brightnessAdjustmentFlags)

                    + "', previous reason: '" + mBrightnessReason + "'.");

            mBrightnessReason.set(mBrightnessReasonTemp);

        } else if (mBrightnessReasonTemp.reason == BrightnessReason.REASON_MANUAL

                && userSetBrightnessChanged) {

            Slog.v(TAG, "Brightness [" + brightnessState + "] manual adjustment.");

        }



        // Update display white-balance.
@@ -2021,7 +2024,8 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call 
                || mPendingScreenBrightnessSetting < 0.0f)) {

            return false;

        }

        if (mCurrentScreenBrightnessSetting == mPendingScreenBrightnessSetting) {

        if (BrightnessSynchronizer.floatEquals(

                mCurrentScreenBrightnessSetting, mPendingScreenBrightnessSetting)) {

            mPendingScreenBrightnessSetting = PowerManager.BRIGHTNESS_INVALID_FLOAT;

            mTemporaryScreenBrightness = PowerManager.BRIGHTNESS_INVALID_FLOAT;

            return false;