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

Commit 65429839 authored by Fiona Campbell's avatar Fiona Campbell
Browse files

Remove DisplayDeviceConfig null checks 

It is now loaded before it is first used, so should never be null therefore we don't need these checks.

Bug: 178183143
Test: manual
Change-Id: Iffcad95568115169102d3e49af97ea2138135fa4
parent da74086b

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;

        }