From 654298393af7bd57816e41f5faea0433274e76b9 Mon Sep 17 00:00:00 2001 From: Fiona Campbell Date: Thu, 25 Feb 2021 16:56:25 +0000 Subject: [PATCH] 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 --- .../server/display/DisplayPowerController.java | 16 ++++------------ .../server/display/LocalDisplayAdapter.java | 6 +----- 2 files changed, 5 insertions(+), 17 deletions(-) diff --git a/services/core/java/com/android/server/display/DisplayPowerController.java b/services/core/java/com/android/server/display/DisplayPowerController.java index 2005a742c3d3f..86142bc1797d3 100644 --- a/services/core/java/com/android/server/display/DisplayPowerController.java +++ b/services/core/java/com/android/server/display/DisplayPowerController.java @@ -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; - } + mBrightnessRampRateFastDecrease = displayDeviceConfig.getBrightnessRampFastDecrease(); + mBrightnessRampRateFastIncrease = displayDeviceConfig.getBrightnessRampFastIncrease(); + mBrightnessRampRateSlowDecrease = displayDeviceConfig.getBrightnessRampSlowDecrease(); + mBrightnessRampRateSlowIncrease = displayDeviceConfig.getBrightnessRampSlowIncrease(); mSkipScreenOnBrightnessRamp = resources.getBoolean( com.android.internal.R.bool.config_skipScreenOnBrightnessRamp); diff --git a/services/core/java/com/android/server/display/LocalDisplayAdapter.java b/services/core/java/com/android/server/display/LocalDisplayAdapter.java index 48f335d775723..3709963b7caa7 100644 --- a/services/core/java/com/android/server/display/LocalDisplayAdapter.java +++ b/services/core/java/com/android/server/display/LocalDisplayAdapter.java @@ -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; }