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

Commit 07565341 authored by Rupesh Bansal's avatar Rupesh Bansal
Browse files

Moved brightness related configs from DPC to DisplayBrightnessController 

Bug: 261574373
Test: atest DisplayBrightnessControllerTest
Change-Id: I216e35c90e3808ef6d426afc62c5d819b35c5b63
parent a48bf36a

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

+5 −1
Original line number Diff line number Diff line
@@ -96,7 +96,11 @@ public class BrightnessSetting { 
        mListeners.remove(l);

    }



    void setBrightness(float brightness) {

    /**

     * Sets the brigtness and broadcasts the change to the listeners.

     * @param brightness The value to which the brightness is to be set.

     */

    public void setBrightness(float brightness) {

        if (Float.isNaN(brightness)) {

            Slog.w(TAG, "Attempting to set invalid brightness");

            return;

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

+32 −112
Original line number Diff line number Diff line
@@ -68,6 +68,7 @@ import com.android.server.am.BatteryStatsService; 
import com.android.server.display.RampAnimator.DualRampAnimator;

import com.android.server.display.brightness.BrightnessEvent;

import com.android.server.display.brightness.BrightnessReason;

import com.android.server.display.brightness.BrightnessUtils;

import com.android.server.display.brightness.DisplayBrightnessController;

import com.android.server.display.color.ColorDisplayService.ColorDisplayServiceInternal;

import com.android.server.display.color.ColorDisplayService.ReduceBrightColorsListener;
@@ -197,8 +198,6 @@ final class DisplayPowerController2 implements AutomaticBrightnessController.Cal 
    // mScreenBrightnessDimConfig.

    private final float mScreenBrightnessMinimumDimAmount;



    private final float mScreenBrightnessDefault;



    // True if auto-brightness should be used.

    private boolean mUseSoftwareAutoBrightnessConfig;
@@ -332,8 +331,6 @@ final class DisplayPowerController2 implements AutomaticBrightnessController.Cal 


    private final BrightnessThrottler mBrightnessThrottler;



    private final BrightnessSetting mBrightnessSetting;



    private final Runnable mOnBrightnessChangeRunnable;



    private final BrightnessEvent mLastBrightnessEvent;
@@ -384,19 +381,6 @@ final class DisplayPowerController2 implements AutomaticBrightnessController.Cal 
    @Nullable

    private BrightnessConfiguration mBrightnessConfiguration;



    // The last brightness that was set by the user and not temporary. Set to

    // PowerManager.BRIGHTNESS_INVALID_FLOAT when a brightness has yet to be recorded.

    private float mLastUserSetScreenBrightness = Float.NaN;



    // The screen brightness setting has changed but not taken effect yet. If this is different

    // from the current screen brightness setting then this is coming from something other than us

    // and should be considered a user interaction.

    private float mPendingScreenBrightnessSetting;



    // The last observed screen brightness setting, either set by us or by the settings app on

    // behalf of the user.

    private float mCurrentScreenBrightnessSetting;



    // The last auto brightness adjustment that was set by the user and not temporary. Set to

    // Float.NaN when an auto-brightness adjustment hasn't been recorded yet.

    private float mAutoBrightnessAdjustment;
@@ -417,7 +401,6 @@ final class DisplayPowerController2 implements AutomaticBrightnessController.Cal 
    private ObjectAnimator mColorFadeOnAnimator;

    private ObjectAnimator mColorFadeOffAnimator;

    private DualRampAnimator<DisplayPowerState> mScreenBrightnessRampAnimator;

    private BrightnessSetting.BrightnessSettingListener mBrightnessSettingListener;



    // True if this DisplayPowerController2 has been stopped and should no longer be running.

    private boolean mStopped;
@@ -471,8 +454,6 @@ final class DisplayPowerController2 implements AutomaticBrightnessController.Cal 
        mBlanker = blanker;

        mContext = context;

        mBrightnessTracker = brightnessTracker;

        // TODO: b/186428377 update brightness setting when display changes

        mBrightnessSetting = brightnessSetting;

        mOnBrightnessChangeRunnable = onBrightnessChangeRunnable;



        PowerManager pm = context.getSystemService(PowerManager.class);
@@ -480,18 +461,13 @@ final class DisplayPowerController2 implements AutomaticBrightnessController.Cal 
        final Resources resources = context.getResources();



        // DOZE AND DIM SETTINGS

        mScreenBrightnessDozeConfig = clampAbsoluteBrightness(

        mScreenBrightnessDozeConfig = BrightnessUtils.clampAbsoluteBrightness(

                pm.getBrightnessConstraint(PowerManager.BRIGHTNESS_CONSTRAINT_TYPE_DOZE));

        mScreenBrightnessDimConfig = clampAbsoluteBrightness(

        mScreenBrightnessDimConfig = BrightnessUtils.clampAbsoluteBrightness(

                pm.getBrightnessConstraint(PowerManager.BRIGHTNESS_CONSTRAINT_TYPE_DIM));

        mScreenBrightnessMinimumDimAmount = resources.getFloat(

                R.dimen.config_screenBrightnessMinimumDimAmountFloat);





        // NORMAL SCREEN SETTINGS

        mScreenBrightnessDefault = clampAbsoluteBrightness(

                mLogicalDisplay.getDisplayInfoLocked().brightnessDefault);



        loadBrightnessRampRates();

        mSkipScreenOnBrightnessRamp = resources.getBoolean(

                R.bool.config_skipScreenOnBrightnessRamp);
@@ -499,7 +475,10 @@ final class DisplayPowerController2 implements AutomaticBrightnessController.Cal 
        mHbmController = createHbmControllerLocked();



        mBrightnessThrottler = createBrightnessThrottlerLocked();



        mDisplayBrightnessController =

                new DisplayBrightnessController(context, null,

                        mDisplayId, mLogicalDisplay.getDisplayInfoLocked().brightnessDefault,

                        brightnessSetting, () -> postBrightnessChangeRunnable());

        // Seed the cached brightness

        saveBrightnessInfo(getScreenBrightnessSetting());
@@ -554,12 +533,7 @@ final class DisplayPowerController2 implements AutomaticBrightnessController.Cal 


        mBrightnessBucketsInDozeConfig = resources.getBoolean(

                R.bool.config_displayBrightnessBucketsInDoze);



        mDisplayBrightnessController =

                new DisplayBrightnessController(context, null, mDisplayId);

        mCurrentScreenBrightnessSetting = getScreenBrightnessSetting();

        mAutoBrightnessAdjustment = getAutoBrightnessAdjustmentSetting();

        mPendingScreenBrightnessSetting = PowerManager.BRIGHTNESS_INVALID_FLOAT;

        mTemporaryAutoBrightnessAdjustment = PowerManager.BRIGHTNESS_INVALID_FLOAT;

        mPendingAutoBrightnessAdjustment = PowerManager.BRIGHTNESS_INVALID_FLOAT;
@@ -773,9 +747,7 @@ final class DisplayPowerController2 implements AutomaticBrightnessController.Cal 
                mAutomaticBrightnessController.stop();

            }



            if (mBrightnessSetting != null) {

                mBrightnessSetting.unregisterListener(mBrightnessSettingListener);

            }

            mDisplayBrightnessController.stop();



            mContext.getContentResolver().unregisterContentObserver(mSettingsObserver);

        }
@@ -854,12 +826,14 @@ final class DisplayPowerController2 implements AutomaticBrightnessController.Cal 
        if (mBrightnessTracker != null && brightness >= PowerManager.BRIGHTNESS_MIN) {

            mBrightnessTracker.start(brightness);

        }

        mBrightnessSettingListener = brightnessValue -> {



        BrightnessSetting.BrightnessSettingListener brightnessSettingListener = brightnessValue -> {

            Message msg = mHandler.obtainMessage(MSG_UPDATE_BRIGHTNESS, brightnessValue);

            mHandler.sendMessage(msg);

        };

        mDisplayBrightnessController

                .registerBrightnessSettingChangeListener(brightnessSettingListener);



        mBrightnessSetting.registerListener(mBrightnessSettingListener);

        mContext.getContentResolver().registerContentObserver(

                Settings.System.getUriFor(Settings.System.SCREEN_AUTO_BRIGHTNESS_ADJ),

                false /*notifyForDescendants*/, mSettingsObserver, UserHandle.USER_ALL);
@@ -1209,7 +1183,8 @@ final class DisplayPowerController2 implements AutomaticBrightnessController.Cal 
                        ? AutomaticBrightnessController.AUTO_BRIGHTNESS_OFF_DUE_TO_DISPLAY_STATE

                        : AutomaticBrightnessController.AUTO_BRIGHTNESS_DISABLED;



        final boolean userSetBrightnessChanged = updateUserSetScreenBrightness();

        final boolean userSetBrightnessChanged = mDisplayBrightnessController

                .updateUserSetScreenBrightness();



        final boolean autoBrightnessAdjustmentChanged = updateAutoBrightnessAdjustment();
@@ -1235,7 +1210,7 @@ final class DisplayPowerController2 implements AutomaticBrightnessController.Cal 
            hadUserBrightnessPoint = mAutomaticBrightnessController.hasUserDataPoints();

            mAutomaticBrightnessController.configure(autoBrightnessState,

                    mBrightnessConfiguration,

                    mLastUserSetScreenBrightness,

                    mDisplayBrightnessController.getLastUserSetScreenBrightness(),

                    userSetBrightnessChanged, autoBrightnessAdjustment,

                    autoBrightnessAdjustmentChanged, mPowerRequest.policy,

                    mShouldResetShortTermModel);
@@ -1247,7 +1222,7 @@ final class DisplayPowerController2 implements AutomaticBrightnessController.Cal 
        }



        boolean updateScreenBrightnessSetting = false;



        float currentBrightnessSetting = mDisplayBrightnessController.getCurrentBrightness();

        // Apply auto-brightness.

        boolean slowChange = false;

        if (Float.isNaN(brightnessState)) {
@@ -1258,14 +1233,14 @@ final class DisplayPowerController2 implements AutomaticBrightnessController.Cal 
                newAutoBrightnessAdjustment =

                        mAutomaticBrightnessController.getAutomaticScreenBrightnessAdjustment();

            }

            if (isValidBrightnessValue(brightnessState)

            if (BrightnessUtils.isValidBrightnessValue(brightnessState)

                    || brightnessState == PowerManager.BRIGHTNESS_OFF_FLOAT) {

                // Use current auto-brightness value and slowly adjust to changes.

                brightnessState = clampScreenBrightness(brightnessState);

                if (mAppliedAutoBrightness && !autoBrightnessAdjustmentChanged) {

                    slowChange = true; // slowly adapt to auto-brightness

                }

                updateScreenBrightnessSetting = mCurrentScreenBrightnessSetting != brightnessState;

                updateScreenBrightnessSetting = currentBrightnessSetting != brightnessState;

                mAppliedAutoBrightness = true;

                mBrightnessReasonTemp.setReason(BrightnessReason.REASON_AUTOMATIC);

                if (mScreenOffBrightnessSensorController != null) {
@@ -1303,9 +1278,10 @@ final class DisplayPowerController2 implements AutomaticBrightnessController.Cal 
        if (Float.isNaN(brightnessState) && autoBrightnessEnabled

                && mScreenOffBrightnessSensorController != null) {

            brightnessState = mScreenOffBrightnessSensorController.getAutomaticScreenBrightness();

            if (isValidBrightnessValue(brightnessState)) {

            if (BrightnessUtils.isValidBrightnessValue(brightnessState)) {

                brightnessState = clampScreenBrightness(brightnessState);

                updateScreenBrightnessSetting = mCurrentScreenBrightnessSetting != brightnessState;

                updateScreenBrightnessSetting = mDisplayBrightnessController.getCurrentBrightness()

                        != brightnessState;

                mBrightnessReasonTemp.setReason(

                        BrightnessReason.REASON_SCREEN_OFF_BRIGHTNESS_SENSOR);

            }
@@ -1313,8 +1289,8 @@ final class DisplayPowerController2 implements AutomaticBrightnessController.Cal 


        // Apply manual brightness.

        if (Float.isNaN(brightnessState)) {

            brightnessState = clampScreenBrightness(mCurrentScreenBrightnessSetting);

            if (brightnessState != mCurrentScreenBrightnessSetting) {

            brightnessState = clampScreenBrightness(currentBrightnessSetting);

            if (brightnessState != currentBrightnessSetting) {

                // The manually chosen screen brightness is outside of the currently allowed

                // range (i.e., high-brightness-mode), make sure we tell the rest of the system

                // by updating the setting.
@@ -1351,7 +1327,7 @@ final class DisplayPowerController2 implements AutomaticBrightnessController.Cal 
            // before applying the low power or dim transformations so that the slider

            // accurately represents the full possible range, even if they range changes what

            // it means in absolute terms.

            updateScreenBrightnessSetting(brightnessState);

            mDisplayBrightnessController.updateScreenBrightnessSetting(brightnessState);

        }



        // Apply dimming by at least some minimum amount when user activity
@@ -1462,7 +1438,7 @@ final class DisplayPowerController2 implements AutomaticBrightnessController.Cal 


            final float currentBrightness = mPowerState.getScreenBrightness();

            final float currentSdrBrightness = mPowerState.getSdrScreenBrightness();

            if (isValidBrightnessValue(animateValue)

            if (BrightnessUtils.isValidBrightnessValue(animateValue)

                    && (animateValue != currentBrightness

                    || sdrAnimateValue != currentSdrBrightness)) {

                if (initialRampSkip || hasBrightnessBuckets
@@ -1897,12 +1873,6 @@ final class DisplayPowerController2 implements AutomaticBrightnessController.Cal 
                mHbmController.getCurrentBrightnessMin(), mHbmController.getCurrentBrightnessMax());

    }



    // Checks whether the brightness is within the valid brightness range, not including off.

    private boolean isValidBrightnessValue(float brightness) {

        return brightness >= PowerManager.BRIGHTNESS_MIN

                && brightness <= PowerManager.BRIGHTNESS_MAX;

    }



    private void animateScreenBrightness(float target, float sdrTarget, float rate) {

        if (DEBUG) {

            Slog.d(mTag, "Animating brightness: target=" + target + ", sdrTarget=" + sdrTarget
@@ -2083,11 +2053,14 @@ final class DisplayPowerController2 implements AutomaticBrightnessController.Cal 
    }



    private void handleSettingsChange(boolean userSwitch) {

        mPendingScreenBrightnessSetting = getScreenBrightnessSetting();

        mDisplayBrightnessController

                .setPendingScreenBrightness(mDisplayBrightnessController

                        .getScreenBrightnessSetting());

        mPendingAutoBrightnessAdjustment = getAutoBrightnessAdjustmentSetting();

        if (userSwitch) {

            // Don't treat user switches as user initiated change.

            setCurrentScreenBrightness(mPendingScreenBrightnessSetting);

            mDisplayBrightnessController.setCurrentScreenBrightness(mDisplayBrightnessController

                    .getPendingScreenBrightness());

            updateAutoBrightnessAdjustment();

            if (mAutomaticBrightnessController != null) {

                mAutomaticBrightnessController.resetShortTermModel();
@@ -2116,34 +2089,12 @@ final class DisplayPowerController2 implements AutomaticBrightnessController.Cal 


    @Override

    public float getScreenBrightnessSetting() {

        float brightness = mBrightnessSetting.getBrightness();

        if (Float.isNaN(brightness)) {

            brightness = mScreenBrightnessDefault;

        }

        return clampAbsoluteBrightness(brightness);

        return mDisplayBrightnessController.getScreenBrightnessSetting();

    }



    @Override

    public void setBrightness(float brightnessValue) {

        // Update the setting, which will eventually call back into DPC to have us actually update

        // the display with the new value.

        mBrightnessSetting.setBrightness(brightnessValue);

    }



    private void updateScreenBrightnessSetting(float brightnessValue) {

        if (!isValidBrightnessValue(brightnessValue)

                || brightnessValue == mCurrentScreenBrightnessSetting) {

            return;

        }

        setCurrentScreenBrightness(brightnessValue);

        mBrightnessSetting.setBrightness(brightnessValue);

    }



    private void setCurrentScreenBrightness(float brightnessValue) {

        if (brightnessValue != mCurrentScreenBrightnessSetting) {

            mCurrentScreenBrightnessSetting = brightnessValue;

            postBrightnessChangeRunnable();

        }

        mDisplayBrightnessController.setBrightness(brightnessValue);

    }



    private void putAutoBrightnessAdjustmentSetting(float adjustment) {
@@ -2169,28 +2120,6 @@ final class DisplayPowerController2 implements AutomaticBrightnessController.Cal 
        return true;

    }



    // We want to return true if the user has set the screen brightness.

    // RBC on, off, and intensity changes will return false.

    // Slider interactions whilst in RBC will return true, just as when in non-rbc.

    private boolean updateUserSetScreenBrightness() {

        if ((Float.isNaN(mPendingScreenBrightnessSetting)

                || mPendingScreenBrightnessSetting < 0.0f)) {

            return false;

        }

        if (mCurrentScreenBrightnessSetting == mPendingScreenBrightnessSetting) {

            mPendingScreenBrightnessSetting = PowerManager.BRIGHTNESS_INVALID_FLOAT;

            mDisplayBrightnessController

                    .setTemporaryBrightness(PowerManager.BRIGHTNESS_INVALID_FLOAT);

            return false;

        }

        setCurrentScreenBrightness(mPendingScreenBrightnessSetting);

        mLastUserSetScreenBrightness = mPendingScreenBrightnessSetting;

        mPendingScreenBrightnessSetting = PowerManager.BRIGHTNESS_INVALID_FLOAT;

        mDisplayBrightnessController

                .setTemporaryBrightness(PowerManager.BRIGHTNESS_INVALID_FLOAT);

        return true;

    }



    private void notifyBrightnessTrackerChanged(float brightness, boolean userInitiated,

            boolean hadUserDataPoint) {

        final float brightnessInNits = convertToNits(brightness);
@@ -2235,7 +2164,6 @@ final class DisplayPowerController2 implements AutomaticBrightnessController.Cal 


        pw.println();

        pw.println("Display Power Controller Configuration:");

        pw.println("  mScreenBrightnessRangeDefault=" + mScreenBrightnessDefault);

        pw.println("  mScreenBrightnessDozeConfig=" + mScreenBrightnessDozeConfig);

        pw.println("  mScreenBrightnessDimConfig=" + mScreenBrightnessDimConfig);

        pw.println("  mUseSoftwareAutoBrightnessConfig=" + mUseSoftwareAutoBrightnessConfig);
@@ -2266,9 +2194,6 @@ final class DisplayPowerController2 implements AutomaticBrightnessController.Cal 
        pw.println();

        pw.println("Display Power Controller Thread State:");

        pw.println("  mPowerRequest=" + mPowerRequest);

        pw.println("  mLastUserSetScreenBrightness=" + mLastUserSetScreenBrightness);

        pw.println("  mPendingScreenBrightnessSetting="

                + mPendingScreenBrightnessSetting);

        pw.println("  mAutoBrightnessAdjustment=" + mAutoBrightnessAdjustment);

        pw.println("  mBrightnessReason=" + mBrightnessReason);

        pw.println("  mTemporaryAutoBrightnessAdjustment=" + mTemporaryAutoBrightnessAdjustment);
@@ -2385,11 +2310,6 @@ final class DisplayPowerController2 implements AutomaticBrightnessController.Cal 
        }

    }



    private static float clampAbsoluteBrightness(float value) {

        return MathUtils.constrain(value, PowerManager.BRIGHTNESS_MIN,

                PowerManager.BRIGHTNESS_MAX);

    }



    private static float clampAutoBrightnessAdjustment(float value) {

        return MathUtils.constrain(value, -1.0f, 1.0f);

    }

services/core/java/com/android/server/display/brightness/BrightnessUtils.java

+9 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
package com.android.server.display.brightness;



import android.os.PowerManager;

import android.util.MathUtils;



import com.android.server.display.DisplayBrightnessState;
@@ -32,6 +33,14 @@ public final class BrightnessUtils { 
                && brightness <= PowerManager.BRIGHTNESS_MAX;

    }



    /**

     * Clamps the brightness value in the maximum and the minimum brightness range

     */

    public static float clampAbsoluteBrightness(float value) {

        return MathUtils.constrain(value, PowerManager.BRIGHTNESS_MIN,

                PowerManager.BRIGHTNESS_MAX);

    }



    /**

     * A utility to construct the DisplayBrightnessState

     */

services/core/java/com/android/server/display/brightness/DisplayBrightnessController.java

+227 −19

File changed.

Preview size limit exceeded, changes collapsed.

services/tests/servicestests/src/com/android/server/display/brightness/DisplayBrightnessControllerTest.java

+167 −2

File changed.

Preview size limit exceeded, changes collapsed.