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

Commit 2f643445 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Fix NPE & spline error" into main

parents 328e453b 86ce7048

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

            }