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

Commit bce28218 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge changes from topic "r3_flicker_high_brightness" into rvc-qpr-dev am: 11bee77d 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12936277

Change-Id: I10794b1337fca712f2c751ce01b87ea86977cfdf
parents 0041910e 11bee77d

core/java/android/hardware/display/DisplayManager.java

+47 −8
Original line number Original line Diff line number Diff line
@@ -870,37 +870,76 @@ public final class DisplayManager { 
    public interface DeviceConfig {

    public interface DeviceConfig {





        /**

        /**

         * Key for refresh rate in the zone defined by thresholds.

         * Key for refresh rate in the low zone defined by thresholds.

         *

         *

         * Note that the name and value don't match because they were added before we had a high

         * zone to consider.

         * @see android.provider.DeviceConfig#NAMESPACE_DISPLAY_MANAGER

         * @see android.provider.DeviceConfig#NAMESPACE_DISPLAY_MANAGER

         * @see android.R.integer#config_defaultZoneBehavior

         * @see android.R.integer#config_defaultZoneBehavior

         */

         */

        String KEY_REFRESH_RATE_IN_ZONE = "refresh_rate_in_zone";

        String KEY_REFRESH_RATE_IN_LOW_ZONE = "refresh_rate_in_zone";





        /**

        /**

         * Key for accessing the display brightness thresholds for the configured refresh rate zone.

         * Key for accessing the low display brightness thresholds for the configured refresh

         * rate zone.

         * The value will be a pair of comma separated integers representing the minimum and maximum

         * The value will be a pair of comma separated integers representing the minimum and maximum

         * thresholds of the zone, respectively, in display backlight units (i.e. [0, 255]).

         * thresholds of the zone, respectively, in display backlight units (i.e. [0, 255]).

         *

         *

         * Note that the name and value don't match because they were added before we had a high

         * zone to consider.

         *

         * @see android.provider.DeviceConfig#NAMESPACE_DISPLAY_MANAGER

         * @see android.provider.DeviceConfig#NAMESPACE_DISPLAY_MANAGER

         * @see android.R.array#config_brightnessThresholdsOfPeakRefreshRate

         * @see android.R.array#config_brightnessThresholdsOfPeakRefreshRate

         * @hide

         * @hide

         */

         */

        String KEY_PEAK_REFRESH_RATE_DISPLAY_BRIGHTNESS_THRESHOLDS =

        String KEY_FIXED_REFRESH_RATE_LOW_DISPLAY_BRIGHTNESS_THRESHOLDS =

                "peak_refresh_rate_brightness_thresholds";

                "peak_refresh_rate_brightness_thresholds";





        /**

        /**

         * Key for accessing the ambient brightness thresholds for the configured refresh rate zone.

         * Key for accessing the low ambient brightness thresholds for the configured refresh

         * The value will be a pair of comma separated integers representing the minimum and maximum

         * rate zone. The value will be a pair of comma separated integers representing the minimum

         * thresholds of the zone, respectively, in lux.

         * and maximum thresholds of the zone, respectively, in lux.

         *

         * Note that the name and value don't match because they were added before we had a high

         * zone to consider.

         *

         *

         * @see android.provider.DeviceConfig#NAMESPACE_DISPLAY_MANAGER

         * @see android.provider.DeviceConfig#NAMESPACE_DISPLAY_MANAGER

         * @see android.R.array#config_ambientThresholdsOfPeakRefreshRate

         * @see android.R.array#config_ambientThresholdsOfPeakRefreshRate

         * @hide

         * @hide

         */

         */

        String KEY_PEAK_REFRESH_RATE_AMBIENT_BRIGHTNESS_THRESHOLDS =

        String KEY_FIXED_REFRESH_RATE_LOW_AMBIENT_BRIGHTNESS_THRESHOLDS =

                "peak_refresh_rate_ambient_thresholds";

                "peak_refresh_rate_ambient_thresholds";

        /**

         * Key for refresh rate in the high zone defined by thresholds.

         *

         * @see android.provider.DeviceConfig#NAMESPACE_DISPLAY_MANAGER

         * @see android.R.integer#config_fixedRefreshRateInHighZone

         */

        String KEY_REFRESH_RATE_IN_HIGH_ZONE = "refresh_rate_in_high_zone";





        /**

         * Key for accessing the display brightness thresholds for the configured refresh rate zone.

         * The value will be a pair of comma separated integers representing the minimum and maximum

         * thresholds of the zone, respectively, in display backlight units (i.e. [0, 255]).

         *

         * @see android.provider.DeviceConfig#NAMESPACE_DISPLAY_MANAGER

         * @see android.R.array#config_brightnessHighThresholdsOfFixedRefreshRate

         * @hide

         */

        String KEY_FIXED_REFRESH_RATE_HIGH_DISPLAY_BRIGHTNESS_THRESHOLDS =

                "fixed_refresh_rate_high_display_brightness_thresholds";



        /**

         * Key for accessing the ambient brightness thresholds for the configured refresh rate zone.

         * The value will be a pair of comma separated integers representing the minimum and maximum

         * thresholds of the zone, respectively, in lux.

         *

         * @see android.provider.DeviceConfig#NAMESPACE_DISPLAY_MANAGER

         * @see android.R.array#config_ambientHighThresholdsOfFixedRefreshRate

         * @hide

         */

        String KEY_FIXED_REFRESH_RATE_HIGH_AMBIENT_BRIGHTNESS_THRESHOLDS =

                "fixed_refresh_rate_high_ambient_brightness_thresholds";

        /**

        /**

         * Key for default peak refresh rate

         * Key for default peak refresh rate

         *

         *

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

+108 −24
Original line number Original line Diff line number Diff line
@@ -69,6 +69,8 @@ public class DisplayModeDirector { 
    private static final int MSG_LOW_BRIGHTNESS_THRESHOLDS_CHANGED = 2;

    private static final int MSG_LOW_BRIGHTNESS_THRESHOLDS_CHANGED = 2;

    private static final int MSG_DEFAULT_PEAK_REFRESH_RATE_CHANGED = 3;

    private static final int MSG_DEFAULT_PEAK_REFRESH_RATE_CHANGED = 3;

    private static final int MSG_REFRESH_RATE_IN_LOW_ZONE_CHANGED = 4;

    private static final int MSG_REFRESH_RATE_IN_LOW_ZONE_CHANGED = 4;

    private static final int MSG_REFRESH_RATE_IN_HIGH_ZONE_CHANGED = 5;

    private static final int MSG_HIGH_BRIGHTNESS_THRESHOLDS_CHANGED = 6;





    // Special ID used to indicate that given vote is to be applied globally, rather than to a

    // Special ID used to indicate that given vote is to be applied globally, rather than to a

    // specific display.

    // specific display.
@@ -514,13 +516,6 @@ public class DisplayModeDirector { 
        }

        }

    }

    }





    @VisibleForTesting

    void updateSettingForHighZone(int refreshRate, int[] brightnessThresholds,

            int[] ambientThresholds) {

        mBrightnessObserver.updateThresholdsRefreshRateForHighZone(refreshRate,

                brightnessThresholds, ambientThresholds);

    }



    /**

    /**

     * Listens for changes refresh rate coordination.

     * Listens for changes refresh rate coordination.

     */

     */
@@ -539,23 +534,41 @@ public class DisplayModeDirector { 
        @Override

        @Override

        public void handleMessage(Message msg) {

        public void handleMessage(Message msg) {

            switch (msg.what) {

            switch (msg.what) {

                case MSG_LOW_BRIGHTNESS_THRESHOLDS_CHANGED:

                case MSG_LOW_BRIGHTNESS_THRESHOLDS_CHANGED: {

                    Pair<int[], int[]> thresholds = (Pair<int[], int[]>) msg.obj;

                    Pair<int[], int[]> thresholds = (Pair<int[], int[]>) msg.obj;

                    mBrightnessObserver.onDeviceConfigLowBrightnessThresholdsChanged(

                    mBrightnessObserver.onDeviceConfigLowBrightnessThresholdsChanged(

                            thresholds.first, thresholds.second);

                            thresholds.first, thresholds.second);

                    break;

                    break;

                }



                case MSG_REFRESH_RATE_IN_LOW_ZONE_CHANGED: {

                    int refreshRateInZone = msg.arg1;

                    mBrightnessObserver.onDeviceConfigRefreshRateInLowZoneChanged(

                            refreshRateInZone);

                    break;

                }



                case MSG_HIGH_BRIGHTNESS_THRESHOLDS_CHANGED: {

                    Pair<int[], int[]> thresholds = (Pair<int[], int[]>) msg.obj;



                    mBrightnessObserver.onDeviceConfigHighBrightnessThresholdsChanged(

                            thresholds.first, thresholds.second);





                case MSG_DEFAULT_PEAK_REFRESH_RATE_CHANGED:

                    Float defaultPeakRefreshRate = (Float) msg.obj;

                    mSettingsObserver.onDeviceConfigDefaultPeakRefreshRateChanged(

                            defaultPeakRefreshRate);

                    break;

                    break;

                }





                case MSG_REFRESH_RATE_IN_LOW_ZONE_CHANGED:

                case MSG_REFRESH_RATE_IN_HIGH_ZONE_CHANGED: {

                    int refreshRateInZone = msg.arg1;

                    int refreshRateInZone = msg.arg1;

                    mBrightnessObserver.onDeviceConfigRefreshRateInLowZoneChanged(

                    mBrightnessObserver.onDeviceConfigRefreshRateInHighZoneChanged(

                            refreshRateInZone);

                            refreshRateInZone);

                    break;

                    break;

                }



                case MSG_DEFAULT_PEAK_REFRESH_RATE_CHANGED:

                    Float defaultPeakRefreshRate = (Float) msg.obj;

                    mSettingsObserver.onDeviceConfigDefaultPeakRefreshRateChanged(

                            defaultPeakRefreshRate);

                    break;





                case MSG_REFRESH_RATE_RANGE_CHANGED:

                case MSG_REFRESH_RATE_RANGE_CHANGED:

                    DesiredDisplayModeSpecsListener desiredDisplayModeSpecsListener =

                    DesiredDisplayModeSpecsListener desiredDisplayModeSpecsListener =
@@ -1219,13 +1232,6 @@ public class DisplayModeDirector { 
                    mLightSensor, LIGHT_SENSOR_RATE_MS * 1000, mHandler);

                    mLightSensor, LIGHT_SENSOR_RATE_MS * 1000, mHandler);

        }

        }





        public void updateThresholdsRefreshRateForHighZone(int refreshRate,

                int[] brightnessThresholds, int[] ambientThresholds) {

            mRefreshRateInHighZone = refreshRate;

            mHighDisplayBrightnessThresholds = brightnessThresholds;

            mHighAmbientBrightnessThresholds = ambientThresholds;

        }



        public void observe(SensorManager sensorManager) {

        public void observe(SensorManager sensorManager) {

            mSensorManager = sensorManager;

            mSensorManager = sensorManager;

            final ContentResolver cr = mContext.getContentResolver();

            final ContentResolver cr = mContext.getContentResolver();
@@ -1245,7 +1251,22 @@ public class DisplayModeDirector { 
                mLowAmbientBrightnessThresholds = lowAmbientBrightnessThresholds;

                mLowAmbientBrightnessThresholds = lowAmbientBrightnessThresholds;

            }

            }







            int[] highDisplayBrightnessThresholds =

                    mDeviceConfigDisplaySettings.getHighDisplayBrightnessThresholds();

            int[] highAmbientBrightnessThresholds =

                    mDeviceConfigDisplaySettings.getHighAmbientBrightnessThresholds();



            if (highDisplayBrightnessThresholds != null && highAmbientBrightnessThresholds != null

                    && highDisplayBrightnessThresholds.length

                    == highAmbientBrightnessThresholds.length) {

                mHighDisplayBrightnessThresholds = highDisplayBrightnessThresholds;

                mHighAmbientBrightnessThresholds = highAmbientBrightnessThresholds;

            }



            mRefreshRateInLowZone = mDeviceConfigDisplaySettings.getRefreshRateInLowZone();

            mRefreshRateInLowZone = mDeviceConfigDisplaySettings.getRefreshRateInLowZone();

            mRefreshRateInHighZone = mDeviceConfigDisplaySettings.getRefreshRateInHighZone();



            restartObserver();

            restartObserver();

            mDeviceConfigDisplaySettings.startListening();

            mDeviceConfigDisplaySettings.startListening();

        }

        }
@@ -1292,6 +1313,29 @@ public class DisplayModeDirector { 
            }

            }

        }

        }





        public void onDeviceConfigHighBrightnessThresholdsChanged(int[] displayThresholds,

                int[] ambientThresholds) {

            if (displayThresholds != null && ambientThresholds != null

                    && displayThresholds.length == ambientThresholds.length) {

                mHighDisplayBrightnessThresholds = displayThresholds;

                mHighAmbientBrightnessThresholds = ambientThresholds;

            } else {

                // Invalid or empty. Use device default.

                mHighDisplayBrightnessThresholds = mContext.getResources().getIntArray(

                        R.array.config_highDisplayBrightnessThresholdsOfFixedRefreshRate);

                mHighAmbientBrightnessThresholds = mContext.getResources().getIntArray(

                        R.array.config_highAmbientBrightnessThresholdsOfFixedRefreshRate);

            }

            restartObserver();

        }



        public void onDeviceConfigRefreshRateInHighZoneChanged(int refreshRate) {

            if (refreshRate != mRefreshRateInHighZone) {

                mRefreshRateInHighZone = refreshRate;

                restartObserver();

            }

        }



        public void dumpLocked(PrintWriter pw) {

        public void dumpLocked(PrintWriter pw) {

            pw.println("  BrightnessObserver");

            pw.println("  BrightnessObserver");

            pw.println("    mAmbientLux: " + mAmbientLux);

            pw.println("    mAmbientLux: " + mAmbientLux);
@@ -1667,7 +1711,7 @@ public class DisplayModeDirector { 
        public int[] getLowDisplayBrightnessThresholds() {

        public int[] getLowDisplayBrightnessThresholds() {

            return getIntArrayProperty(

            return getIntArrayProperty(

                    DisplayManager.DeviceConfig.

                    DisplayManager.DeviceConfig.

                            KEY_PEAK_REFRESH_RATE_DISPLAY_BRIGHTNESS_THRESHOLDS);

                            KEY_FIXED_REFRESH_RATE_LOW_DISPLAY_BRIGHTNESS_THRESHOLDS);

        }

        }





        /*

        /*
@@ -1676,7 +1720,7 @@ public class DisplayModeDirector { 
        public int[] getLowAmbientBrightnessThresholds() {

        public int[] getLowAmbientBrightnessThresholds() {

            return getIntArrayProperty(

            return getIntArrayProperty(

                    DisplayManager.DeviceConfig.

                    DisplayManager.DeviceConfig.

                            KEY_PEAK_REFRESH_RATE_AMBIENT_BRIGHTNESS_THRESHOLDS);

                            KEY_FIXED_REFRESH_RATE_LOW_AMBIENT_BRIGHTNESS_THRESHOLDS);

        }

        }





        public int getRefreshRateInLowZone() {

        public int getRefreshRateInLowZone() {
@@ -1685,7 +1729,37 @@ public class DisplayModeDirector { 




            int refreshRate = mDeviceConfig.getInt(

            int refreshRate = mDeviceConfig.getInt(

                    DeviceConfig.NAMESPACE_DISPLAY_MANAGER,

                    DeviceConfig.NAMESPACE_DISPLAY_MANAGER,

                    DisplayManager.DeviceConfig.KEY_REFRESH_RATE_IN_ZONE,

                    DisplayManager.DeviceConfig.KEY_REFRESH_RATE_IN_LOW_ZONE,

                    defaultRefreshRateInZone);



            return refreshRate;

        }



        /*

         * Return null if no such property or wrong format (not comma separated integers).

         */

        public int[] getHighDisplayBrightnessThresholds() {

            return getIntArrayProperty(

                    DisplayManager.DeviceConfig

                            .KEY_FIXED_REFRESH_RATE_HIGH_DISPLAY_BRIGHTNESS_THRESHOLDS);

        }



        /*

         * Return null if no such property or wrong format (not comma separated integers).

         */

        public int[] getHighAmbientBrightnessThresholds() {

            return getIntArrayProperty(

                    DisplayManager.DeviceConfig

                            .KEY_FIXED_REFRESH_RATE_HIGH_AMBIENT_BRIGHTNESS_THRESHOLDS);

        }



        public int getRefreshRateInHighZone() {

            int defaultRefreshRateInZone = mContext.getResources().getInteger(

                    R.integer.config_fixedRefreshRateInHighZone);



            int refreshRate = mDeviceConfig.getInt(

                    DeviceConfig.NAMESPACE_DISPLAY_MANAGER,

                    DisplayManager.DeviceConfig.KEY_REFRESH_RATE_IN_HIGH_ZONE,

                    defaultRefreshRateInZone);

                    defaultRefreshRateInZone);





            return refreshRate;

            return refreshRate;
@@ -1720,6 +1794,16 @@ public class DisplayModeDirector { 
                    .sendToTarget();

                    .sendToTarget();

            mHandler.obtainMessage(MSG_REFRESH_RATE_IN_LOW_ZONE_CHANGED, refreshRateInLowZone, 0)

            mHandler.obtainMessage(MSG_REFRESH_RATE_IN_LOW_ZONE_CHANGED, refreshRateInLowZone, 0)

                    .sendToTarget();

                    .sendToTarget();



            int[] highDisplayBrightnessThresholds = getHighDisplayBrightnessThresholds();

            int[] highAmbientBrightnessThresholds = getHighAmbientBrightnessThresholds();

            int refreshRateInHighZone = getRefreshRateInHighZone();



            mHandler.obtainMessage(MSG_HIGH_BRIGHTNESS_THRESHOLDS_CHANGED,

                    new Pair<>(highDisplayBrightnessThresholds, highAmbientBrightnessThresholds))

                    .sendToTarget();

            mHandler.obtainMessage(MSG_REFRESH_RATE_IN_HIGH_ZONE_CHANGED, refreshRateInHighZone, 0)

                    .sendToTarget();

        }

        }





        private int[] getIntArrayProperty(String prop) {

        private int[] getIntArrayProperty(String prop) {

services/tests/servicestests/src/com/android/server/display/DisplayModeDirectorTest.java

+46 −7
Original line number Original line Diff line number Diff line
@@ -16,9 +16,12 @@ 




package com.android.server.display;

package com.android.server.display;





import static android.hardware.display.DisplayManager.DeviceConfig.KEY_PEAK_REFRESH_RATE_AMBIENT_BRIGHTNESS_THRESHOLDS;

import static android.hardware.display.DisplayManager.DeviceConfig.KEY_FIXED_REFRESH_RATE_HIGH_AMBIENT_BRIGHTNESS_THRESHOLDS;

import static android.hardware.display.DisplayManager.DeviceConfig.KEY_PEAK_REFRESH_RATE_DISPLAY_BRIGHTNESS_THRESHOLDS;

import static android.hardware.display.DisplayManager.DeviceConfig.KEY_FIXED_REFRESH_RATE_HIGH_DISPLAY_BRIGHTNESS_THRESHOLDS;

import static android.hardware.display.DisplayManager.DeviceConfig.KEY_REFRESH_RATE_IN_ZONE;

import static android.hardware.display.DisplayManager.DeviceConfig.KEY_FIXED_REFRESH_RATE_LOW_AMBIENT_BRIGHTNESS_THRESHOLDS;

import static android.hardware.display.DisplayManager.DeviceConfig.KEY_FIXED_REFRESH_RATE_LOW_DISPLAY_BRIGHTNESS_THRESHOLDS;

import static android.hardware.display.DisplayManager.DeviceConfig.KEY_REFRESH_RATE_IN_HIGH_ZONE;

import static android.hardware.display.DisplayManager.DeviceConfig.KEY_REFRESH_RATE_IN_LOW_ZONE;





import static com.android.server.display.DisplayModeDirector.Vote.PRIORITY_FLICKER;

import static com.android.server.display.DisplayModeDirector.Vote.PRIORITY_FLICKER;
@@ -451,7 +454,11 @@ public class DisplayModeDirectorTest { 
        setPeakRefreshRate(90 /*fps*/);

        setPeakRefreshRate(90 /*fps*/);

        director.getSettingsObserver().setDefaultRefreshRate(90);

        director.getSettingsObserver().setDefaultRefreshRate(90);

        director.getBrightnessObserver().setDefaultDisplayState(true);

        director.getBrightnessObserver().setDefaultDisplayState(true);

        director.updateSettingForHighZone(60, new int[] {255}, new int[] {8000});



        final FakeDeviceConfig config = mInjector.getDeviceConfig();

        config.setRefreshRateInHighZone(60);

        config.setHighDisplayBrightnessThresholds(new int[] { 255 });

        config.setHighAmbientBrightnessThresholds(new int[] { 8000 });





        Sensor lightSensor = createLightSensor();

        Sensor lightSensor = createLightSensor();

        SensorManager sensorManager = createMockSensorManager(lightSensor);

        SensorManager sensorManager = createMockSensorManager(lightSensor);
@@ -508,7 +515,7 @@ public class DisplayModeDirectorTest { 




        void setRefreshRateInLowZone(int fps) {

        void setRefreshRateInLowZone(int fps) {

            putPropertyAndNotify(

            putPropertyAndNotify(

                    DeviceConfig.NAMESPACE_DISPLAY_MANAGER, KEY_REFRESH_RATE_IN_ZONE,

                    DeviceConfig.NAMESPACE_DISPLAY_MANAGER, KEY_REFRESH_RATE_IN_LOW_ZONE,

                    String.valueOf(fps));

                    String.valueOf(fps));

        }

        }
@@ -521,7 +528,7 @@ public class DisplayModeDirectorTest { 




            putPropertyAndNotify(

            putPropertyAndNotify(

                    DeviceConfig.NAMESPACE_DISPLAY_MANAGER,

                    DeviceConfig.NAMESPACE_DISPLAY_MANAGER,

                    KEY_PEAK_REFRESH_RATE_DISPLAY_BRIGHTNESS_THRESHOLDS,

                    KEY_FIXED_REFRESH_RATE_LOW_DISPLAY_BRIGHTNESS_THRESHOLDS,

                    thresholds);

                    thresholds);

        }

        }
@@ -534,7 +541,39 @@ public class DisplayModeDirectorTest { 




            putPropertyAndNotify(

            putPropertyAndNotify(

                    DeviceConfig.NAMESPACE_DISPLAY_MANAGER,

                    DeviceConfig.NAMESPACE_DISPLAY_MANAGER,

                    KEY_PEAK_REFRESH_RATE_AMBIENT_BRIGHTNESS_THRESHOLDS,

                    KEY_FIXED_REFRESH_RATE_LOW_AMBIENT_BRIGHTNESS_THRESHOLDS,

                    thresholds);

        }



        void setRefreshRateInHighZone(int fps) {

            putPropertyAndNotify(

                    DeviceConfig.NAMESPACE_DISPLAY_MANAGER, KEY_REFRESH_RATE_IN_HIGH_ZONE,

                    String.valueOf(fps));

        }



        void setHighDisplayBrightnessThresholds(int[] brightnessThresholds) {

            String thresholds = toPropertyValue(brightnessThresholds);



            if (DEBUG) {

                Slog.e(TAG, "Brightness Thresholds = " + thresholds);

            }



            putPropertyAndNotify(

                    DeviceConfig.NAMESPACE_DISPLAY_MANAGER,

                    KEY_FIXED_REFRESH_RATE_HIGH_DISPLAY_BRIGHTNESS_THRESHOLDS,

                    thresholds);

        }



        void setHighAmbientBrightnessThresholds(int[] ambientThresholds) {

            String thresholds = toPropertyValue(ambientThresholds);



            if (DEBUG) {

                Slog.e(TAG, "Ambient Thresholds = " + thresholds);

            }



            putPropertyAndNotify(

                    DeviceConfig.NAMESPACE_DISPLAY_MANAGER,

                    KEY_FIXED_REFRESH_RATE_HIGH_AMBIENT_BRIGHTNESS_THRESHOLDS,

                    thresholds);

                    thresholds);

        }

        }