summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Long Ling <longling@google.com> 2019-08-23 06:24:30 -0700
committer android-build-merger <android-build-merger@google.com> 2019-08-23 06:24:30 -0700
commit7227ff19aa34ac7e6d2aaa375c362f495f4e935c (patch)
tree56e131526af0dda0e0f99f613ec58d795933d5dd
parente05a580d0386a208f9d4811f36c6994e5dac340f (diff)
parentdde6248065f2009c709e86adcfa1cef450eea949 (diff)
DO NOT MERGE DeviceConfig: Add Name space and keys for Display Manager
am: dde6248065 Change-Id: Ic452fed2390fab0f69799a192ce86402b4c0cb7e
-rw-r--r--core/java/android/hardware/display/DisplayManager.java36
-rw-r--r--core/java/android/provider/DeviceConfig.java8
2 files changed, 44 insertions, 0 deletions
diff --git a/core/java/android/hardware/display/DisplayManager.java b/core/java/android/hardware/display/DisplayManager.java
index 8a0a9c7c9d9d..21c49add6cba 100644
--- a/core/java/android/hardware/display/DisplayManager.java
+++ b/core/java/android/hardware/display/DisplayManager.java
@@ -820,4 +820,40 @@ public final class DisplayManager {
*/
void onDisplayChanged(int displayId);
}
+
+ /**
+ * Interface for accessing keys belonging to {@link
+ * android.provider.DeviceConfig#NAMESPACE_DISPLAY_MANAGER}.
+ * @hide
+ */
+ public interface DeviceConfig {
+
+ /**
+ * Key for accessing the 60 hz only regions.
+ *
+ * @see android.provider.DeviceConfig#NAMESPACE_DISPLAY_MANAGER
+ * @see android.R.array#config_brightnessThresholdsOfPeakRefreshRate
+ * @hide
+ */
+ String KEY_PEAK_REFRESH_RATE_BRIGHTNESS_THRESHOLDS =
+ "peak_refresh_rate_brightness_thresholds";
+
+ /**
+ * Key for accessing the 60 hz only regions.
+ *
+ * @see android.provider.DeviceConfig#NAMESPACE_DISPLAY_MANAGER
+ * @see android.R.array#config_brightnessThresholdsOfPeakRefreshRate
+ * @hide
+ */
+ String KEY_PEAK_REFRESH_RATE_AMBIENT_THRESHOLDS = "peak_refresh_rate_ambient_thresholds";
+
+ /**
+ * Key for default peak refresh rate
+ *
+ * @see android.provider.DeviceConfig#NAMESPACE_DISPLAY_MANAGER
+ * @see android.R.integer#config_defaultPeakRefreshRate
+ * @hide
+ */
+ String KEY_PEAK_REFRESH_RATE_DEFAULT = "peak_refresh_rate_default";
+ }
}
diff --git a/core/java/android/provider/DeviceConfig.java b/core/java/android/provider/DeviceConfig.java
index ea50ae810535..c27576bacf96 100644
--- a/core/java/android/provider/DeviceConfig.java
+++ b/core/java/android/provider/DeviceConfig.java
@@ -136,6 +136,14 @@ public final class DeviceConfig {
public static final String NAMESPACE_DEX_BOOT = "dex_boot";
/**
+ * Namespace for display manager related features. The names to access the properties in this
+ * namespace should be defined in {@link android.hardware.display.DisplayManager}.
+ *
+ * @hide
+ */
+ public static final String NAMESPACE_DISPLAY_MANAGER = "display_manager";
+
+ /**
* Namespace for all Game Driver features.
*
* @hide