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

Commit 3b44bd77 authored by Oleg Petšjonkin's avatar Oleg Petšjonkin Committed by Android (Google) Code Review
Browse files

Merge "Moving HysteresisLevels to DDC, cleanup duplicate code" into main

parents f8d2ed89 9bca340c

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

+5 −8
Original line number Diff line number Diff line
@@ -55,6 +55,7 @@ import com.android.internal.os.BackgroundThread; 
import com.android.server.EventLogTags;

import com.android.server.display.brightness.BrightnessEvent;

import com.android.server.display.brightness.clamper.BrightnessClamperController;

import com.android.server.display.config.HysteresisLevels;



import java.io.PrintWriter;

import java.lang.annotation.Retention;
@@ -673,14 +674,10 @@ public class AutomaticBrightnessController { 
        }



        pw.println();

        pw.println("  mAmbientBrightnessThresholds=");

        mAmbientBrightnessThresholds.dump(pw);

        pw.println("  mScreenBrightnessThresholds=");

        mScreenBrightnessThresholds.dump(pw);

        pw.println("  mScreenBrightnessThresholdsIdle=");

        mScreenBrightnessThresholdsIdle.dump(pw);

        pw.println("  mAmbientBrightnessThresholdsIdle=");

        mAmbientBrightnessThresholdsIdle.dump(pw);

        pw.println("  mAmbientBrightnessThresholds=" + mAmbientBrightnessThresholds);

        pw.println("  mAmbientBrightnessThresholdsIdle=" + mAmbientBrightnessThresholdsIdle);

        pw.println("  mScreenBrightnessThresholds=" + mScreenBrightnessThresholds);

        pw.println("  mScreenBrightnessThresholdsIdle=" + mScreenBrightnessThresholdsIdle);

    }



    public float[] getLastSensorValues() {

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

+33 −670

File changed.

Preview size limit exceeded, changes collapsed.

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

+9 −83
Original line number Diff line number Diff line
@@ -86,6 +86,7 @@ import com.android.server.display.brightness.clamper.BrightnessClamperController 
import com.android.server.display.brightness.strategy.AutomaticBrightnessStrategy;

import com.android.server.display.color.ColorDisplayService.ColorDisplayServiceInternal;

import com.android.server.display.color.ColorDisplayService.ReduceBrightColorsListener;

import com.android.server.display.config.HysteresisLevels;

import com.android.server.display.feature.DisplayManagerFlags;

import com.android.server.display.layout.Layout;

import com.android.server.display.state.DisplayStateController;
@@ -1050,76 +1051,20 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call 


        if (defaultModeBrightnessMapper != null) {

            // Ambient Lux - Active Mode Brightness Thresholds

            float[] ambientBrighteningThresholds =

                    mDisplayDeviceConfig.getAmbientBrighteningPercentages();

            float[] ambientDarkeningThresholds =

                    mDisplayDeviceConfig.getAmbientDarkeningPercentages();

            float[] ambientBrighteningLevels =

                    mDisplayDeviceConfig.getAmbientBrighteningLevels();

            float[] ambientDarkeningLevels =

                    mDisplayDeviceConfig.getAmbientDarkeningLevels();

            float ambientDarkeningMinThreshold =

                    mDisplayDeviceConfig.getAmbientLuxDarkeningMinThreshold();

            float ambientBrighteningMinThreshold =

                    mDisplayDeviceConfig.getAmbientLuxBrighteningMinThreshold();

            HysteresisLevels ambientBrightnessThresholds = mInjector.getHysteresisLevels(

                    ambientBrighteningThresholds, ambientDarkeningThresholds,

                    ambientBrighteningLevels, ambientDarkeningLevels, ambientDarkeningMinThreshold,

                    ambientBrighteningMinThreshold);

            HysteresisLevels ambientBrightnessThresholds =

                    mDisplayDeviceConfig.getAmbientBrightnessHysteresis();



            // Display - Active Mode Brightness Thresholds

            float[] screenBrighteningThresholds =

                    mDisplayDeviceConfig.getScreenBrighteningPercentages();

            float[] screenDarkeningThresholds =

                    mDisplayDeviceConfig.getScreenDarkeningPercentages();

            float[] screenBrighteningLevels =

                    mDisplayDeviceConfig.getScreenBrighteningLevels();

            float[] screenDarkeningLevels =

                    mDisplayDeviceConfig.getScreenDarkeningLevels();

            float screenDarkeningMinThreshold =

                    mDisplayDeviceConfig.getScreenDarkeningMinThreshold();

            float screenBrighteningMinThreshold =

                    mDisplayDeviceConfig.getScreenBrighteningMinThreshold();

            HysteresisLevels screenBrightnessThresholds = mInjector.getHysteresisLevels(

                    screenBrighteningThresholds, screenDarkeningThresholds,

                    screenBrighteningLevels, screenDarkeningLevels, screenDarkeningMinThreshold,

                    screenBrighteningMinThreshold, true);

            HysteresisLevels screenBrightnessThresholds =

                    mDisplayDeviceConfig.getScreenBrightnessHysteresis();



            // Ambient Lux - Idle Screen Brightness Thresholds

            float ambientDarkeningMinThresholdIdle =

                    mDisplayDeviceConfig.getAmbientLuxDarkeningMinThresholdIdle();

            float ambientBrighteningMinThresholdIdle =

                    mDisplayDeviceConfig.getAmbientLuxBrighteningMinThresholdIdle();

            float[] ambientBrighteningThresholdsIdle =

                    mDisplayDeviceConfig.getAmbientBrighteningPercentagesIdle();

            float[] ambientDarkeningThresholdsIdle =

                    mDisplayDeviceConfig.getAmbientDarkeningPercentagesIdle();

            float[] ambientBrighteningLevelsIdle =

                    mDisplayDeviceConfig.getAmbientBrighteningLevelsIdle();

            float[] ambientDarkeningLevelsIdle =

                    mDisplayDeviceConfig.getAmbientDarkeningLevelsIdle();

            HysteresisLevels ambientBrightnessThresholdsIdle = mInjector.getHysteresisLevels(

                    ambientBrighteningThresholdsIdle, ambientDarkeningThresholdsIdle,

                    ambientBrighteningLevelsIdle, ambientDarkeningLevelsIdle,

                    ambientDarkeningMinThresholdIdle, ambientBrighteningMinThresholdIdle);

            HysteresisLevels ambientBrightnessThresholdsIdle =

                    mDisplayDeviceConfig.getAmbientBrightnessIdleHysteresis();



            // Display - Idle Screen Brightness Thresholds

            float screenDarkeningMinThresholdIdle =

                    mDisplayDeviceConfig.getScreenDarkeningMinThresholdIdle();

            float screenBrighteningMinThresholdIdle =

                    mDisplayDeviceConfig.getScreenBrighteningMinThresholdIdle();

            float[] screenBrighteningThresholdsIdle =

                    mDisplayDeviceConfig.getScreenBrighteningPercentagesIdle();

            float[] screenDarkeningThresholdsIdle =

                    mDisplayDeviceConfig.getScreenDarkeningPercentagesIdle();

            float[] screenBrighteningLevelsIdle =

                    mDisplayDeviceConfig.getScreenBrighteningLevelsIdle();

            float[] screenDarkeningLevelsIdle =

                    mDisplayDeviceConfig.getScreenDarkeningLevelsIdle();

            HysteresisLevels screenBrightnessThresholdsIdle = mInjector.getHysteresisLevels(

                    screenBrighteningThresholdsIdle, screenDarkeningThresholdsIdle,

                    screenBrighteningLevelsIdle, screenDarkeningLevelsIdle,

                    screenDarkeningMinThresholdIdle, screenBrighteningMinThresholdIdle);

            HysteresisLevels screenBrightnessThresholdsIdle =

                    mDisplayDeviceConfig.getScreenBrightnessIdleHysteresis();



            long brighteningLightDebounce = mDisplayDeviceConfig

                    .getAutoBrightnessBrighteningLightDebounce();
@@ -3208,25 +3153,6 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call 
                    AUTO_BRIGHTNESS_MODE_DEFAULT, displayWhiteBalanceController);

        }



        HysteresisLevels getHysteresisLevels(float[] brighteningThresholdsPercentages,

                float[] darkeningThresholdsPercentages, float[] brighteningThresholdLevels,

                float[] darkeningThresholdLevels, float minDarkeningThreshold,

                float minBrighteningThreshold) {

            return new HysteresisLevels(brighteningThresholdsPercentages,

                    darkeningThresholdsPercentages, brighteningThresholdLevels,

                    darkeningThresholdLevels, minDarkeningThreshold, minBrighteningThreshold);

        }



        HysteresisLevels getHysteresisLevels(float[] brighteningThresholdsPercentages,

                float[] darkeningThresholdsPercentages, float[] brighteningThresholdLevels,

                float[] darkeningThresholdLevels, float minDarkeningThreshold,

                float minBrighteningThreshold, boolean potentialOldBrightnessRange) {

            return new HysteresisLevels(brighteningThresholdsPercentages,

                    darkeningThresholdsPercentages, brighteningThresholdLevels,

                    darkeningThresholdLevels, minDarkeningThreshold, minBrighteningThreshold,

                    potentialOldBrightnessRange);

        }



        ScreenOffBrightnessSensorController getScreenOffBrightnessSensorController(

                SensorManager sensorManager,

                Sensor lightSensor,

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

deleted100644 → 0
+0 −152
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2016 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



package com.android.server.display;



import android.util.Slog;



import com.android.server.display.utils.DebugUtils;



import java.io.PrintWriter;

import java.util.Arrays;



/**

 * A helper class for handling access to illuminance hysteresis level values.

 */

public class HysteresisLevels {

    private static final String TAG = "HysteresisLevels";



    // To enable these logs, run:

    // 'adb shell setprop persist.log.tag.HysteresisLevels DEBUG && adb reboot'

    private static final boolean DEBUG = DebugUtils.isDebuggable(TAG);



    private final float[] mBrighteningThresholdsPercentages;

    private final float[] mDarkeningThresholdsPercentages;

    private final float[] mBrighteningThresholdLevels;

    private final float[] mDarkeningThresholdLevels;

    private final float mMinDarkening;

    private final float mMinBrightening;



    /**

     * Creates a {@code HysteresisLevels} object with the given equal-length

     * float arrays.

     * @param brighteningThresholdsPercentages 0-100 of thresholds

     * @param darkeningThresholdsPercentages 0-100 of thresholds

     * @param brighteningThresholdLevels float array of brightness values in the relevant units

     * @param minBrighteningThreshold the minimum value for which the brightening value needs to

     *                                return.

     * @param minDarkeningThreshold the minimum value for which the darkening value needs to return.

     * @param potentialOldBrightnessRange whether or not the values used could be from the old

     *                                    screen brightness range ie, between 1-255.

    */

    HysteresisLevels(float[] brighteningThresholdsPercentages,

            float[] darkeningThresholdsPercentages,

            float[] brighteningThresholdLevels, float[] darkeningThresholdLevels,

            float minDarkeningThreshold, float minBrighteningThreshold,

            boolean potentialOldBrightnessRange) {

        if (brighteningThresholdsPercentages.length != brighteningThresholdLevels.length

                || darkeningThresholdsPercentages.length != darkeningThresholdLevels.length) {

            throw new IllegalArgumentException("Mismatch between hysteresis array lengths.");

        }

        mBrighteningThresholdsPercentages =

                setArrayFormat(brighteningThresholdsPercentages, 100.0f);

        mDarkeningThresholdsPercentages =

                setArrayFormat(darkeningThresholdsPercentages, 100.0f);

        mBrighteningThresholdLevels = setArrayFormat(brighteningThresholdLevels, 1.0f);

        mDarkeningThresholdLevels = setArrayFormat(darkeningThresholdLevels, 1.0f);

        mMinDarkening = minDarkeningThreshold;

        mMinBrightening = minBrighteningThreshold;

    }



    HysteresisLevels(float[] brighteningThresholdsPercentages,

            float[] darkeningThresholdsPercentages,

            float[] brighteningThresholdLevels, float[] darkeningThresholdLevels,

            float minDarkeningThreshold, float minBrighteningThreshold) {

        this(brighteningThresholdsPercentages, darkeningThresholdsPercentages,

                brighteningThresholdLevels, darkeningThresholdLevels, minDarkeningThreshold,

                minBrighteningThreshold, false);

    }



    /**

     * Return the brightening hysteresis threshold for the given value level.

     */

    public float getBrighteningThreshold(float value) {

        final float brightConstant = getReferenceLevel(value,

                mBrighteningThresholdLevels, mBrighteningThresholdsPercentages);



        float brightThreshold = value * (1.0f + brightConstant);

        if (DEBUG) {

            Slog.d(TAG, "bright hysteresis constant=" + brightConstant + ", threshold="

                    + brightThreshold + ", value=" + value);

        }



        brightThreshold = Math.max(brightThreshold, value + mMinBrightening);

        return brightThreshold;

    }



    /**

     * Return the darkening hysteresis threshold for the given value level.

     */

    public float getDarkeningThreshold(float value) {

        final float darkConstant = getReferenceLevel(value,

                mDarkeningThresholdLevels, mDarkeningThresholdsPercentages);

        float darkThreshold = value * (1.0f - darkConstant);

        if (DEBUG) {

            Slog.d(TAG, "dark hysteresis constant=: " + darkConstant + ", threshold="

                    + darkThreshold + ", value=" + value);

        }

        darkThreshold = Math.min(darkThreshold, value - mMinDarkening);

        return Math.max(darkThreshold, 0.0f);

    }



    /**

     * Return the hysteresis constant for the closest threshold value from the given array.

     */

    private float getReferenceLevel(float value, float[] thresholdLevels,

            float[] thresholdPercentages) {

        if (thresholdLevels == null || thresholdLevels.length == 0 || value < thresholdLevels[0]) {

            return 0.0f;

        }

        int index = 0;

        while (index < thresholdLevels.length - 1 && value >= thresholdLevels[index + 1]) {

            index++;

        }

        return thresholdPercentages[index];

    }



    /**

     * Return a float array where each i-th element equals {@code configArray[i]/divideFactor}.

     */

    private float[] setArrayFormat(float[] configArray, float divideFactor) {

        float[] levelArray = new float[configArray.length];

        for (int index = 0; levelArray.length > index; ++index) {

            levelArray[index] = configArray[index] / divideFactor;

        }

        return levelArray;

    }



    void dump(PrintWriter pw) {

        pw.println("HysteresisLevels");

        pw.println("  mBrighteningThresholdLevels=" + Arrays.toString(mBrighteningThresholdLevels));

        pw.println("  mBrighteningThresholdsPercentages="

                + Arrays.toString(mBrighteningThresholdsPercentages));

        pw.println("  mMinBrightening=" + mMinBrightening);

        pw.println("  mDarkeningThresholdLevels=" + Arrays.toString(mDarkeningThresholdLevels));

        pw.println("  mDarkeningThresholdsPercentages="

                + Arrays.toString(mDarkeningThresholdsPercentages));

        pw.println("  mMinDarkening=" + mMinDarkening);

    }

}

services/core/java/com/android/server/display/config/HysteresisLevels.java

0 → 100644
+463 −0

File added.

Preview size limit exceeded, changes collapsed.