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

Commit 5ccd5ecd authored by Rupesh Bansal's avatar Rupesh Bansal Committed by Android (Google) Code Review
Browse files

Merge "Bringing DPC and DPC2 in sync"

parents b199448e e1e1b128

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

+2 −2
Original line number Original line Diff line number Diff line
@@ -989,8 +989,8 @@ final class DisplayPowerController2 implements AutomaticBrightnessController.Cal 
                    R.array.config_screenBrighteningThresholds);

                    R.array.config_screenBrighteningThresholds);

            int[] screenDarkeningThresholds = resources.getIntArray(

            int[] screenDarkeningThresholds = resources.getIntArray(

                    R.array.config_screenDarkeningThresholds);

                    R.array.config_screenDarkeningThresholds);

            int[] screenThresholdLevels = resources.getIntArray(

            float[] screenThresholdLevels = BrightnessMappingStrategy.getFloatArray(resources

                    R.array.config_screenThresholdLevels);

                    .obtainTypedArray(com.android.internal.R.array.config_screenThresholdLevels));

            float screenDarkeningMinThreshold =

            float screenDarkeningMinThreshold =

                    mDisplayDeviceConfig.getScreenDarkeningMinThreshold();

                    mDisplayDeviceConfig.getScreenDarkeningMinThreshold();

            float screenBrighteningMinThreshold =

            float screenBrighteningMinThreshold =