diff options
| author | 2019-08-26 21:59:22 +0000 | |
|---|---|---|
| committer | 2019-08-26 21:59:22 +0000 | |
| commit | ba9b991d1ebcf1ae9f66f03583c93ff37b77ff5c (patch) | |
| tree | 5e412140b6655992f43c021789318aa2bd702ac0 | |
| parent | 01addff1b8675aa94564c24bae4322135c400f4f (diff) | |
| parent | 260c524f473568b495a39b0a2955a2df6bed7759 (diff) | |
Merge "DeviceConfig: Add Name space and keys for Display Manager"
| -rw-r--r-- | api/system-current.txt | 1 | ||||
| -rw-r--r-- | core/java/android/hardware/display/DisplayManager.java | 36 | ||||
| -rw-r--r-- | core/java/android/provider/DeviceConfig.java | 9 |
3 files changed, 46 insertions, 0 deletions
diff --git a/api/system-current.txt b/api/system-current.txt index 86e5f2e31a43..61ca84ac971d 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -5858,6 +5858,7 @@ package android.provider { field public static final String NAMESPACE_CONNECTIVITY = "connectivity"; field public static final String NAMESPACE_CONTENT_CAPTURE = "content_capture"; field public static final String NAMESPACE_DEX_BOOT = "dex_boot"; + field public static final String NAMESPACE_DISPLAY_MANAGER = "display_manager"; field public static final String NAMESPACE_GAME_DRIVER = "game_driver"; field public static final String NAMESPACE_INPUT_NATIVE_BOOT = "input_native_boot"; field public static final String NAMESPACE_INTELLIGENCE_ATTENTION = "intelligence_attention"; 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 bc03e51bd63e..b7676b611fe3 100644 --- a/core/java/android/provider/DeviceConfig.java +++ b/core/java/android/provider/DeviceConfig.java @@ -136,6 +136,15 @@ 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 + */ + @SystemApi + public static final String NAMESPACE_DISPLAY_MANAGER = "display_manager"; + + /** * Namespace for all Game Driver features. * * @hide |