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

Commit 6a327a5e authored by Fiona Campbell's avatar Fiona Campbell Committed by Automerger Merge Worker
Browse files

Merge "Remove DisplayDeviceConfig null checks" into sc-dev am: 1bb886a1 

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic157f840ffed770c31553cf8a41417f4defd80f6
parents 144a5362 1bb886a1

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

+4 −12
Original line number Diff line number Diff line
@@ -469,18 +469,10 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call 


        DisplayDeviceConfig displayDeviceConfig = logicalDisplay

                .getPrimaryDisplayDeviceLocked().getDisplayDeviceConfig();

        // TODO: (b/178183143) Ensure that the ddc is not null

        if (displayDeviceConfig != null) {

        mBrightnessRampRateFastDecrease = displayDeviceConfig.getBrightnessRampFastDecrease();

        mBrightnessRampRateFastIncrease = displayDeviceConfig.getBrightnessRampFastIncrease();

        mBrightnessRampRateSlowDecrease = displayDeviceConfig.getBrightnessRampSlowDecrease();

        mBrightnessRampRateSlowIncrease = displayDeviceConfig.getBrightnessRampSlowIncrease();

        } else {

            mBrightnessRampRateFastDecrease = 1.0f;

            mBrightnessRampRateFastIncrease = 1.0f;

            mBrightnessRampRateSlowDecrease = 1.0f;

            mBrightnessRampRateSlowIncrease = 1.0f;

        }

        mSkipScreenOnBrightnessRamp = resources.getBoolean(

                com.android.internal.R.bool.config_skipScreenOnBrightnessRamp);

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

+1 −5
Original line number Diff line number Diff line
@@ -638,11 +638,7 @@ final class LocalDisplayAdapter extends DisplayAdapter { 
                mInfo.flags |= DisplayDeviceInfo.FLAG_TRUSTED;

                mInfo.brightnessMinimum = PowerManager.BRIGHTNESS_MIN;

                mInfo.brightnessMaximum = PowerManager.BRIGHTNESS_MAX;

                if (mDisplayDeviceConfig != null) {

                    mInfo.brightnessDefault = mDisplayDeviceConfig.getBrightnessDefault();

                } else {

                    mInfo.brightnessDefault = 0.5f;

                }

                mInfo.brightnessDefault = getDisplayDeviceConfig().getBrightnessDefault();

            }

            return mInfo;

        }