Snap for 5853686 from 402c7bb521361872547286f129026158ec952d1b to qt-qpr1-release (ce5ec9ec) · Commits · e / os / android_frameworks_base

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

+29 −5

Original line number	Diff line number	Diff line
		@@ -829,23 +829,36 @@ public final class DisplayManager {
		public interface DeviceConfig {

		/**
		* Key for accessing the 60 hz only regions.
		* Key for refresh rate in the zone defined by thresholds.
		*
		* @see android.provider.DeviceConfig#NAMESPACE_DISPLAY_MANAGER
		* @see android.R.integer#config_defaultZoneBehavior
		*/
		String KEY_REFRESH_RATE_IN_ZONE = "refresh_rate_in_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_brightnessThresholdsOfPeakRefreshRate
		* @hide
		*/
		String KEY_PEAK_REFRESH_RATE_BRIGHTNESS_THRESHOLDS =
		String KEY_PEAK_REFRESH_RATE_DISPLAY_BRIGHTNESS_THRESHOLDS =
		"peak_refresh_rate_brightness_thresholds";

		/**
		* Key for accessing the 60 hz only regions.
		* 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_brightnessThresholdsOfPeakRefreshRate
		* @see android.R.array#config_ambientThresholdsOfPeakRefreshRate
		* @hide
		*/
		String KEY_PEAK_REFRESH_RATE_AMBIENT_THRESHOLDS = "peak_refresh_rate_ambient_thresholds";
		String KEY_PEAK_REFRESH_RATE_AMBIENT_BRIGHTNESS_THRESHOLDS =
		"peak_refresh_rate_ambient_thresholds";

		/**
		* Key for default peak refresh rate
		@@ -855,5 +868,16 @@ public final class DisplayManager {
		* @hide
		*/
		String KEY_PEAK_REFRESH_RATE_DEFAULT = "peak_refresh_rate_default";

		/**
		* Key for controlling which packages are explicitly blocked from running at refresh rates
		* higher than 60hz. An app may be added to this list if they exhibit performance issues at
		* higher refresh rates.
		*
		* @see android.provider.DeviceConfig#NAMESPACE_DISPLAY_MANAGER
		* @see android.R.array#config_highRefreshRateBlacklist
		* @hide
		*/
		String KEY_HIGH_REFRESH_RATE_BLACKLIST = "high_refresh_rate_blacklist";
		}
		}

core/java/android/provider/DeviceConfig.java

+0 −9

Original line number	Diff line number	Diff line
		@@ -358,15 +358,6 @@ public final class DeviceConfig {
		*/
		String KEY_SYSTEM_GESTURE_EXCLUSION_LOG_DEBOUNCE_MILLIS =
		"system_gesture_exclusion_log_debounce_millis";

		/**
		* Key for controlling which packages are explicitly blocked from running at refresh rates
		* higher than 60hz.
		*
		* @see android.provider.DeviceConfig#NAMESPACE_WINDOW_MANAGER
		* @hide
		*/
		String KEY_HIGH_REFRESH_RATE_BLACKLIST = "high_refresh_rate_blacklist";
		}

		private static final Object sLock = new Object();

core/java/android/view/inputmethod/InputMethodManager.java

+4 −3

Original line number	Diff line number	Diff line
		@@ -707,8 +707,9 @@ public final class InputMethodManager {
		if (mBindSequence != bindSequence) {
		return;
		}
		if (matrixValues == null) {
		// That this app is unbound from the parent ActivityView. In this case,
		if (matrixValues == null \|\| mActivityViewToScreenMatrix == null) {
		// Either InputBoundResult#mActivityViewToScreenMatrixValues is null
		// OR this app is unbound from the parent ActivityView. In this case,
		// calling updateCursorAnchorInfo() isn't safe. Only clear the matrix.
		mActivityViewToScreenMatrix = null;
		return;

core/res/res/values/config.xml

+4 −0

Original line number	Diff line number	Diff line
		@@ -4167,6 +4167,10 @@
		-->
		</integer-array>

		<!-- Default refresh rate in the zone defined by brightness and ambient thresholds.
		If non-positive, then the refresh rate is unchanged even if thresholds are configured. -->
		<integer name="config_defaultRefreshRateInZone">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

+1 −0

Original line number	Diff line number	Diff line
		@@ -3791,6 +3791,7 @@

		<!-- For high refresh rate displays -->
		<java-symbol type="integer" name="config_defaultPeakRefreshRate" />
		<java-symbol type="integer" name="config_defaultRefreshRateInZone" />
		<java-symbol type="array" name="config_brightnessThresholdsOfPeakRefreshRate" />
		<java-symbol type="array" name="config_ambientThresholdsOfPeakRefreshRate" />