Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove DisplayDeviceConfig null checks

Browse Source 
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
This commit is contained in:
Fiona Campbell
2021-02-25 16:56:25 +00:00
parent da74086ba4
commit 654298393a
2 changed files with 5 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
services/core/java/com/android/server/display/DisplayPowerController.java
View File

@@ -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);

6
services/core/java/com/android/server/display/LocalDisplayAdapter.java
View File

@@ -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;
}