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

Commit cfe5b618 authored by Michael Wright's avatar Michael Wright Committed by Android (Google) Code Review
Browse files

Merge "Add follower DPC tests"

parents e9b64eb7 1e3ef210

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

+65 −12
Original line number Diff line number Diff line
@@ -1011,7 +1011,7 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call 
        }

        mBrightnessSettingListener = brightnessValue -> {

            Message msg = mHandler.obtainMessage(MSG_UPDATE_BRIGHTNESS, brightnessValue);

            mHandler.sendMessage(msg);

            mHandler.sendMessageAtTime(msg, mClock.uptimeMillis());

        };



        mBrightnessSetting.registerListener(mBrightnessSettingListener);
@@ -1040,7 +1040,7 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call 


        final boolean isIdleScreenBrightnessEnabled = resources.getBoolean(

                R.bool.config_enableIdleScreenBrightnessMode);

        mInteractiveModeBrightnessMapper = BrightnessMappingStrategy.create(resources,

        mInteractiveModeBrightnessMapper = mInjector.getInteractiveModeBrightnessMapper(resources,

                mDisplayDeviceConfig, mDisplayWhiteBalanceController);

        if (isIdleScreenBrightnessEnabled) {

            mIdleModeBrightnessMapper = BrightnessMappingStrategy.createForIdleMode(resources,
@@ -1065,7 +1065,7 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call 
                    mDisplayDeviceConfig.getAmbientLuxDarkeningMinThreshold();

            float ambientBrighteningMinThreshold =

                    mDisplayDeviceConfig.getAmbientLuxBrighteningMinThreshold();

            HysteresisLevels ambientBrightnessThresholds = new HysteresisLevels(

            HysteresisLevels ambientBrightnessThresholds = mInjector.getHysteresisLevels(

                    ambientBrighteningThresholds, ambientDarkeningThresholds,

                    ambientBrighteningLevels, ambientDarkeningLevels, ambientDarkeningMinThreshold,

                    ambientBrighteningMinThreshold);
@@ -1083,7 +1083,7 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call 
                    mDisplayDeviceConfig.getScreenDarkeningMinThreshold();

            float screenBrighteningMinThreshold =

                    mDisplayDeviceConfig.getScreenBrighteningMinThreshold();

            HysteresisLevels screenBrightnessThresholds = new HysteresisLevels(

            HysteresisLevels screenBrightnessThresholds = mInjector.getHysteresisLevels(

                    screenBrighteningThresholds, screenDarkeningThresholds,

                    screenBrighteningLevels, screenDarkeningLevels, screenDarkeningMinThreshold,

                    screenBrighteningMinThreshold, true);
@@ -1101,7 +1101,7 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call 
                    mDisplayDeviceConfig.getAmbientBrighteningLevelsIdle();

            float[] ambientDarkeningLevelsIdle =

                    mDisplayDeviceConfig.getAmbientDarkeningLevelsIdle();

            HysteresisLevels ambientBrightnessThresholdsIdle = new HysteresisLevels(

            HysteresisLevels ambientBrightnessThresholdsIdle = mInjector.getHysteresisLevels(

                    ambientBrighteningThresholdsIdle, ambientDarkeningThresholdsIdle,

                    ambientBrighteningLevelsIdle, ambientDarkeningLevelsIdle,

                    ambientDarkeningMinThresholdIdle, ambientBrighteningMinThresholdIdle);
@@ -1119,7 +1119,7 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call 
                    mDisplayDeviceConfig.getScreenBrighteningLevelsIdle();

            float[] screenDarkeningLevelsIdle =

                    mDisplayDeviceConfig.getScreenDarkeningLevelsIdle();

            HysteresisLevels screenBrightnessThresholdsIdle = new HysteresisLevels(

            HysteresisLevels screenBrightnessThresholdsIdle = mInjector.getHysteresisLevels(

                    screenBrighteningThresholdsIdle, screenDarkeningThresholdsIdle,

                    screenBrighteningLevelsIdle, screenDarkeningLevelsIdle,

                    screenDarkeningMinThresholdIdle, screenBrighteningMinThresholdIdle);
@@ -1155,8 +1155,8 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call 
            if (mAutomaticBrightnessController != null) {

                mAutomaticBrightnessController.stop();

            }

            mAutomaticBrightnessController = new AutomaticBrightnessController(this,

                    handler.getLooper(), mSensorManager, mLightSensor,

            mAutomaticBrightnessController = mInjector.getAutomaticBrightnessController(

                    this, handler.getLooper(), mSensorManager, mLightSensor,

                    mInteractiveModeBrightnessMapper, lightSensorWarmUpTimeConfig,

                    PowerManager.BRIGHTNESS_MIN, PowerManager.BRIGHTNESS_MAX, dozeScaleFactor,

                    lightSensorRate, initialLightSensorRate, brighteningLightDebounce,
@@ -1257,7 +1257,7 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call 
        public void onAnimationEnd() {

            sendUpdatePowerState();

            Message msg = mHandler.obtainMessage(MSG_BRIGHTNESS_RAMP_DONE);

            mHandler.sendMessage(msg);

            mHandler.sendMessageAtTime(msg, mClock.uptimeMillis());

        }

    };
@@ -2949,7 +2949,8 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call 
                msg.what = MSG_STATSD_HBM_BRIGHTNESS;

                msg.arg1 = Float.floatToIntBits(brightness);

                msg.arg2 = mDisplayStatsId;

                mHandler.sendMessageDelayed(msg, BRIGHTNESS_CHANGE_STATSD_REPORT_INTERVAL_MS);

                mHandler.sendMessageAtTime(msg, mClock.uptimeMillis()

                        + BRIGHTNESS_CHANGE_STATSD_REPORT_INTERVAL_MS);

            }

        }

    }
@@ -3105,7 +3106,7 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call 
        @Override

        public void onScreenOn() {

            Message msg = mHandler.obtainMessage(MSG_SCREEN_ON_UNBLOCKED, this);

            mHandler.sendMessage(msg);

            mHandler.sendMessageAtTime(msg, mClock.uptimeMillis());

        }

    }
@@ -3113,7 +3114,7 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call 
        @Override

        public void onScreenOff() {

            Message msg = mHandler.obtainMessage(MSG_SCREEN_OFF_UNBLOCKED, this);

            mHandler.sendMessage(msg);

            mHandler.sendMessageAtTime(msg, mClock.uptimeMillis());

        }

    }
@@ -3195,6 +3196,58 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call 
                FloatProperty<DisplayPowerState> secondProperty) {

            return new DualRampAnimator(dps, firstProperty, secondProperty);

        }



        AutomaticBrightnessController getAutomaticBrightnessController(

                AutomaticBrightnessController.Callbacks callbacks, Looper looper,

                SensorManager sensorManager, Sensor lightSensor,

                BrightnessMappingStrategy interactiveModeBrightnessMapper,

                int lightSensorWarmUpTime, float brightnessMin, float brightnessMax,

                float dozeScaleFactor, int lightSensorRate, int initialLightSensorRate,

                long brighteningLightDebounceConfig, long darkeningLightDebounceConfig,

                boolean resetAmbientLuxAfterWarmUpConfig,

                HysteresisLevels ambientBrightnessThresholds,

                HysteresisLevels screenBrightnessThresholds,

                HysteresisLevels ambientBrightnessThresholdsIdle,

                HysteresisLevels screenBrightnessThresholdsIdle, Context context,

                HighBrightnessModeController hbmController, BrightnessThrottler brightnessThrottler,

                BrightnessMappingStrategy idleModeBrightnessMapper, int ambientLightHorizonShort,

                int ambientLightHorizonLong, float userLux, float userBrightness) {

            return new AutomaticBrightnessController(callbacks, looper, sensorManager, lightSensor,

                    interactiveModeBrightnessMapper, lightSensorWarmUpTime, brightnessMin,

                    brightnessMax, dozeScaleFactor, lightSensorRate, initialLightSensorRate,

                    brighteningLightDebounceConfig, darkeningLightDebounceConfig,

                    resetAmbientLuxAfterWarmUpConfig, ambientBrightnessThresholds,

                    screenBrightnessThresholds, ambientBrightnessThresholdsIdle,

                    screenBrightnessThresholdsIdle, context, hbmController, brightnessThrottler,

                    idleModeBrightnessMapper, ambientLightHorizonShort, ambientLightHorizonLong,

                    userLux, userBrightness);

        }



        BrightnessMappingStrategy getInteractiveModeBrightnessMapper(Resources resources,

                DisplayDeviceConfig displayDeviceConfig,

                DisplayWhiteBalanceController displayWhiteBalanceController) {

            return BrightnessMappingStrategy.create(resources,

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

        }

    }



    static class CachedBrightnessInfo {

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

+65 −12
Original line number Diff line number Diff line
@@ -850,7 +850,7 @@ final class DisplayPowerController2 implements AutomaticBrightnessController.Cal 


        BrightnessSetting.BrightnessSettingListener brightnessSettingListener = brightnessValue -> {

            Message msg = mHandler.obtainMessage(MSG_UPDATE_BRIGHTNESS, brightnessValue);

            mHandler.sendMessage(msg);

            mHandler.sendMessageAtTime(msg, mClock.uptimeMillis());

        };

        mDisplayBrightnessController

                .registerBrightnessSettingChangeListener(brightnessSettingListener);
@@ -880,7 +880,7 @@ final class DisplayPowerController2 implements AutomaticBrightnessController.Cal 


        final boolean isIdleScreenBrightnessEnabled = resources.getBoolean(

                R.bool.config_enableIdleScreenBrightnessMode);

        mInteractiveModeBrightnessMapper = BrightnessMappingStrategy.create(resources,

        mInteractiveModeBrightnessMapper = mInjector.getInteractiveModeBrightnessMapper(resources,

                mDisplayDeviceConfig, mDisplayWhiteBalanceController);

        if (isIdleScreenBrightnessEnabled) {

            mIdleModeBrightnessMapper = BrightnessMappingStrategy.createForIdleMode(resources,
@@ -905,7 +905,7 @@ final class DisplayPowerController2 implements AutomaticBrightnessController.Cal 
                    mDisplayDeviceConfig.getAmbientLuxDarkeningMinThreshold();

            float ambientBrighteningMinThreshold =

                    mDisplayDeviceConfig.getAmbientLuxBrighteningMinThreshold();

            HysteresisLevels ambientBrightnessThresholds = new HysteresisLevels(

            HysteresisLevels ambientBrightnessThresholds = mInjector.getHysteresisLevels(

                    ambientBrighteningThresholds, ambientDarkeningThresholds,

                    ambientBrighteningLevels, ambientDarkeningLevels, ambientDarkeningMinThreshold,

                    ambientBrighteningMinThreshold);
@@ -923,7 +923,7 @@ final class DisplayPowerController2 implements AutomaticBrightnessController.Cal 
                    mDisplayDeviceConfig.getScreenDarkeningMinThreshold();

            float screenBrighteningMinThreshold =

                    mDisplayDeviceConfig.getScreenBrighteningMinThreshold();

            HysteresisLevels screenBrightnessThresholds = new HysteresisLevels(

            HysteresisLevels screenBrightnessThresholds = mInjector.getHysteresisLevels(

                    screenBrighteningThresholds, screenDarkeningThresholds,

                    screenBrighteningLevels, screenDarkeningLevels, screenDarkeningMinThreshold,

                    screenBrighteningMinThreshold, true);
@@ -941,7 +941,7 @@ final class DisplayPowerController2 implements AutomaticBrightnessController.Cal 
                    mDisplayDeviceConfig.getAmbientBrighteningLevelsIdle();

            float[] ambientDarkeningLevelsIdle =

                    mDisplayDeviceConfig.getAmbientDarkeningLevelsIdle();

            HysteresisLevels ambientBrightnessThresholdsIdle = new HysteresisLevels(

            HysteresisLevels ambientBrightnessThresholdsIdle = mInjector.getHysteresisLevels(

                    ambientBrighteningThresholdsIdle, ambientDarkeningThresholdsIdle,

                    ambientBrighteningLevelsIdle, ambientDarkeningLevelsIdle,

                    ambientDarkeningMinThresholdIdle, ambientBrighteningMinThresholdIdle);
@@ -959,7 +959,7 @@ final class DisplayPowerController2 implements AutomaticBrightnessController.Cal 
                    mDisplayDeviceConfig.getScreenBrighteningLevelsIdle();

            float[] screenDarkeningLevelsIdle =

                    mDisplayDeviceConfig.getScreenDarkeningLevelsIdle();

            HysteresisLevels screenBrightnessThresholdsIdle = new HysteresisLevels(

            HysteresisLevels screenBrightnessThresholdsIdle = mInjector.getHysteresisLevels(

                    screenBrighteningThresholdsIdle, screenDarkeningThresholdsIdle,

                    screenBrighteningLevelsIdle, screenDarkeningLevelsIdle,

                    screenDarkeningMinThresholdIdle, screenBrighteningMinThresholdIdle);
@@ -995,8 +995,8 @@ final class DisplayPowerController2 implements AutomaticBrightnessController.Cal 
            if (mAutomaticBrightnessController != null) {

                mAutomaticBrightnessController.stop();

            }

            mAutomaticBrightnessController = new AutomaticBrightnessController(this,

                    handler.getLooper(), mSensorManager, mLightSensor,

            mAutomaticBrightnessController = mInjector.getAutomaticBrightnessController(

                    this, handler.getLooper(), mSensorManager, mLightSensor,

                    mInteractiveModeBrightnessMapper, lightSensorWarmUpTimeConfig,

                    PowerManager.BRIGHTNESS_MIN, PowerManager.BRIGHTNESS_MAX, dozeScaleFactor,

                    lightSensorRate, initialLightSensorRate, brighteningLightDebounce,
@@ -1094,7 +1094,7 @@ final class DisplayPowerController2 implements AutomaticBrightnessController.Cal 
        public void onAnimationEnd() {

            sendUpdatePowerState();

            Message msg = mHandler.obtainMessage(MSG_BRIGHTNESS_RAMP_DONE);

            mHandler.sendMessage(msg);

            mHandler.sendMessageAtTime(msg, mClock.uptimeMillis());

        }

    };
@@ -2458,7 +2458,8 @@ final class DisplayPowerController2 implements AutomaticBrightnessController.Cal 
                msg.what = MSG_STATSD_HBM_BRIGHTNESS;

                msg.arg1 = Float.floatToIntBits(brightness);

                msg.arg2 = mDisplayStatsId;

                mHandler.sendMessageDelayed(msg, BRIGHTNESS_CHANGE_STATSD_REPORT_INTERVAL_MS);

                mHandler.sendMessageAtTime(msg, mClock.uptimeMillis()

                        + BRIGHTNESS_CHANGE_STATSD_REPORT_INTERVAL_MS);

            }

        }

    }
@@ -2589,7 +2590,7 @@ final class DisplayPowerController2 implements AutomaticBrightnessController.Cal 
        @Override

        public void onScreenOn() {

            Message msg = mHandler.obtainMessage(MSG_SCREEN_ON_UNBLOCKED, this);

            mHandler.sendMessage(msg);

            mHandler.sendMessageAtTime(msg, mClock.uptimeMillis());

        }

    }
@@ -2597,7 +2598,7 @@ final class DisplayPowerController2 implements AutomaticBrightnessController.Cal 
        @Override

        public void onScreenOff() {

            Message msg = mHandler.obtainMessage(MSG_SCREEN_OFF_UNBLOCKED, this);

            mHandler.sendMessage(msg);

            mHandler.sendMessageAtTime(msg, mClock.uptimeMillis());

        }

    }
@@ -2671,6 +2672,58 @@ final class DisplayPowerController2 implements AutomaticBrightnessController.Cal 
                    looper, nudgeUpdatePowerState,

                    displayId, sensorManager, /* injector= */ null);

        }



        AutomaticBrightnessController getAutomaticBrightnessController(

                AutomaticBrightnessController.Callbacks callbacks, Looper looper,

                SensorManager sensorManager, Sensor lightSensor,

                BrightnessMappingStrategy interactiveModeBrightnessMapper,

                int lightSensorWarmUpTime, float brightnessMin, float brightnessMax,

                float dozeScaleFactor, int lightSensorRate, int initialLightSensorRate,

                long brighteningLightDebounceConfig, long darkeningLightDebounceConfig,

                boolean resetAmbientLuxAfterWarmUpConfig,

                HysteresisLevels ambientBrightnessThresholds,

                HysteresisLevels screenBrightnessThresholds,

                HysteresisLevels ambientBrightnessThresholdsIdle,

                HysteresisLevels screenBrightnessThresholdsIdle, Context context,

                HighBrightnessModeController hbmController, BrightnessThrottler brightnessThrottler,

                BrightnessMappingStrategy idleModeBrightnessMapper, int ambientLightHorizonShort,

                int ambientLightHorizonLong, float userLux, float userBrightness) {

            return new AutomaticBrightnessController(callbacks, looper, sensorManager, lightSensor,

                    interactiveModeBrightnessMapper, lightSensorWarmUpTime, brightnessMin,

                    brightnessMax, dozeScaleFactor, lightSensorRate, initialLightSensorRate,

                    brighteningLightDebounceConfig, darkeningLightDebounceConfig,

                    resetAmbientLuxAfterWarmUpConfig, ambientBrightnessThresholds,

                    screenBrightnessThresholds, ambientBrightnessThresholdsIdle,

                    screenBrightnessThresholdsIdle, context, hbmController, brightnessThrottler,

                    idleModeBrightnessMapper, ambientLightHorizonShort, ambientLightHorizonLong,

                    userLux, userBrightness);

        }



        BrightnessMappingStrategy getInteractiveModeBrightnessMapper(Resources resources,

                DisplayDeviceConfig displayDeviceConfig,

                DisplayWhiteBalanceController displayWhiteBalanceController) {

            return BrightnessMappingStrategy.create(resources,

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

        }

    }



    static class CachedBrightnessInfo {

services/tests/mockingservicestests/src/com/android/server/display/DisplayPowerController2Test.java

+304 −68

File changed.

Preview size limit exceeded, changes collapsed.

services/tests/mockingservicestests/src/com/android/server/display/DisplayPowerControllerTest.java

+310 −73

File changed.

Preview size limit exceeded, changes collapsed.