Merge cherrypicks of [13350919, 13351137, 13351103, 13350944, 13351985,... (db4df63a) · Commits · e / os / android_frameworks_base

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

+8 −47

Original line number	Diff line number	Diff line
		@@ -875,76 +875,37 @@ public final class DisplayManager {
		public interface DeviceConfig {

		/**
		* Key for refresh rate in the low zone defined by thresholds.
		* Key for refresh rate in the 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.R.integer#config_defaultZoneBehavior
		*/
		String KEY_REFRESH_RATE_IN_LOW_ZONE = "refresh_rate_in_zone";
		String KEY_REFRESH_RATE_IN_ZONE = "refresh_rate_in_zone";

		/**
		* Key for accessing the low display brightness thresholds for the configured refresh
		* rate 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]).
		*
		* 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.R.array#config_brightnessThresholdsOfPeakRefreshRate
		* @hide
		*/
		String KEY_FIXED_REFRESH_RATE_LOW_DISPLAY_BRIGHTNESS_THRESHOLDS =
		String KEY_PEAK_REFRESH_RATE_DISPLAY_BRIGHTNESS_THRESHOLDS =
		"peak_refresh_rate_brightness_thresholds";

		/**
		* Key for accessing the low 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.
		*
		* 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.R.array#config_ambientThresholdsOfPeakRefreshRate
		* @hide
		*/
		String KEY_FIXED_REFRESH_RATE_LOW_AMBIENT_BRIGHTNESS_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
		* @see android.R.array#config_ambientThresholdsOfPeakRefreshRate
		* @hide
		*/
		String KEY_FIXED_REFRESH_RATE_HIGH_AMBIENT_BRIGHTNESS_THRESHOLDS =
		"fixed_refresh_rate_high_ambient_brightness_thresholds";
		String KEY_PEAK_REFRESH_RATE_AMBIENT_BRIGHTNESS_THRESHOLDS =
		"peak_refresh_rate_ambient_thresholds";

		/**
		* Key for default peak refresh rate
		*

core/res/res/values/config.xml

+0 −29

Original line number	Diff line number	Diff line
		@@ -4138,35 +4138,6 @@
		If non-positive, then the refresh rate is unchanged even if thresholds are configured. -->
		<integer name="config_defaultRefreshRateInZone">0</integer>

		<!-- The display uses different gamma curves for different refresh rates. It's hard for panel
		vendor to tune the curves to have exact same brightness for different refresh rate. So
		flicker could be observed at switch time. The issue can be observed on the screen with
		even full white content at the high brightness. To prevent flickering, we support fixed
		refresh rates if the display and ambient brightness are equal to or above the provided
		thresholds. You can define multiple threshold levels as higher brightness environments
		may have lower display brightness requirements for the flickering is visible. And the
		high brightness environment could have higher threshold.
		For example, fixed refresh rate if
		display brightness >= disp0 && ambient brightness >= amb0
		\|\| display brightness >= disp1 && ambient brightness >= amb1 -->
		<integer-array translatable="false" name="config_highDisplayBrightnessThresholdsOfFixedRefreshRate">
		<!--
		<item>disp0</item>
		<item>disp1</item>
		-->
		</integer-array>

		<integer-array translatable="false" name="config_highAmbientBrightnessThresholdsOfFixedRefreshRate">
		<!--
		<item>amb0</item>
		<item>amb1</item>
		-->
		</integer-array>

		<!-- Default refresh rate in the high zone defined by brightness and ambient thresholds.
		If non-positive, then the refresh rate is unchanged even if thresholds are configured. -->
		<integer name="config_fixedRefreshRateInHighZone">0</integer>

		<!-- The type of the light sensor to be used by the display framework for things like
		auto-brightness. If unset, then it just gets the default sensor of type TYPE_LIGHT. -->
		<string name="config_displayLightSensorType" translatable="false" />

core/res/res/values/symbols.xml

+0 −5

Original line number	Diff line number	Diff line
		@@ -3783,11 +3783,6 @@
		<java-symbol type="array" name="config_brightnessThresholdsOfPeakRefreshRate" />
		<java-symbol type="array" name="config_ambientThresholdsOfPeakRefreshRate" />

		<!-- For fixed refresh rate displays in high brightness-->
		<java-symbol type="integer" name="config_fixedRefreshRateInHighZone" />
		<java-symbol type="array" name="config_highDisplayBrightnessThresholdsOfFixedRefreshRate" />
		<java-symbol type="array" name="config_highAmbientBrightnessThresholdsOfFixedRefreshRate" />

		<!-- For Auto-Brightness -->
		<java-symbol type="string" name="config_displayLightSensorType" />

services/core/Android.bp

+0 −7

Original line number	Diff line number	Diff line
		filegroup {
		name: "services.core-sources-deviceconfig-interface",
		srcs: [
		"java/com/android/server/utils/DeviceConfigInterface.java"
		],
		}

		filegroup {
		name: "services.core-sources",
		srcs: ["java/*/.java"],

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

+152 −515

File changed.

Preview size limit exceeded, changes collapsed.