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

Commit 86ce7048 authored Mar 27, 2024 by Fiona Campbell

Fix NPE & spline error

- Fix NPE - ensure DisplayDeviceConfig is not called when null
- Additionally, ensure that we don't call any color matrix calls, for the even dimmer feature, if the even dimmer data is null (or DisplayDeviceConfig is null)

Bug: 331559855
Bug: 331512820
Bug: 331540863
Test: atest DisplayServiceTests

Change-Id: I8dfbe6cafe0709262275f02a3a0085a7b1ad609e

parent dad0862b

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

+0 −1

Original line number	Diff line number	Diff line
		@@ -1930,7 +1930,6 @@ public class DisplayDeviceConfig {
		*
		* @return true if even dimmer mode is enabled
		*/
		@VisibleForTesting
		public boolean isEvenDimmerAvailable() {
		return mEvenDimmerBrightnessData != null;
		}

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

+3 −1

Original line number	Diff line number	Diff line
		@@ -940,7 +940,9 @@ final class LocalDisplayAdapter extends DisplayAdapter {
		final float nits = backlightToNits(backlight);
		final float sdrNits = backlightToNits(sdrBacklight);

		if (getFeatureFlags().isEvenDimmerEnabled()) {
		if (getFeatureFlags().isEvenDimmerEnabled()
		&& mDisplayDeviceConfig != null
		&& mDisplayDeviceConfig.isEvenDimmerAvailable()) {
		applyColorMatrixBasedDimming(brightnessState);
		}

services/core/java/com/android/server/display/brightness/clamper/BrightnessClamperController.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -285,7 +285,7 @@ public class BrightnessClamperController {
		List<BrightnessStateModifier> modifiers = new ArrayList<>();
		modifiers.add(new DisplayDimModifier(context));
		modifiers.add(new BrightnessLowPowerModeModifier());
		if (flags.isEvenDimmerEnabled()) {
		if (flags.isEvenDimmerEnabled() && displayDeviceConfig != null) {
		modifiers.add(new BrightnessLowLuxModifier(handler, listener, context,
		displayDeviceConfig));
		}