diff options
| author | 2022-11-25 11:58:51 +0000 | |
|---|---|---|
| committer | 2022-11-25 11:58:51 +0000 | |
| commit | a079a35e22fa308603bd29b970565efb8ed58d98 (patch) | |
| tree | a85d99c058d0af1fb9b1200caea1c959f5d25e14 | |
| parent | 3f0f4d88a580b5d59a8bcc365fb1e7c606e34116 (diff) | |
| parent | 93d190d65aa07a3f272b796e6a5c44b2e282612b (diff) | |
Merge "HDMI: Add new DeviceConfig namespace for HDMI Control features"
| -rw-r--r-- | core/api/system-current.txt | 1 | ||||
| -rw-r--r-- | core/java/android/provider/DeviceConfig.java | 8 | ||||
| -rw-r--r-- | services/core/java/com/android/server/am/SettingsToPropertiesMapper.java | 1 |
3 files changed, 10 insertions, 0 deletions
diff --git a/core/api/system-current.txt b/core/api/system-current.txt index 72bff0f088a3..8175d25573cc 100644 --- a/core/api/system-current.txt +++ b/core/api/system-current.txt @@ -10562,6 +10562,7 @@ package android.provider { field @Deprecated 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_HDMI_CONTROL = "hdmi_control"; field public static final String NAMESPACE_INPUT_NATIVE_BOOT = "input_native_boot"; field public static final String NAMESPACE_INTELLIGENCE_ATTENTION = "intelligence_attention"; field public static final String NAMESPACE_LMKD_NATIVE = "lmkd_native"; diff --git a/core/java/android/provider/DeviceConfig.java b/core/java/android/provider/DeviceConfig.java index 19e7bd4e748b..ca88ae306c59 100644 --- a/core/java/android/provider/DeviceConfig.java +++ b/core/java/android/provider/DeviceConfig.java @@ -262,6 +262,14 @@ public final class DeviceConfig { public static final String NAMESPACE_GAME_DRIVER = "game_driver"; /** + * Namespace for all HDMI Control features. + * + * @hide + */ + @SystemApi + public static final String NAMESPACE_HDMI_CONTROL = "hdmi_control"; + + /** * Namespace for all input-related features that are used at the native level. * These features are applied at reboot. * diff --git a/services/core/java/com/android/server/am/SettingsToPropertiesMapper.java b/services/core/java/com/android/server/am/SettingsToPropertiesMapper.java index f16347f33f71..f22624c32676 100644 --- a/services/core/java/com/android/server/am/SettingsToPropertiesMapper.java +++ b/services/core/java/com/android/server/am/SettingsToPropertiesMapper.java @@ -104,6 +104,7 @@ public class SettingsToPropertiesMapper { DeviceConfig.NAMESPACE_VIRTUALIZATION_FRAMEWORK_NATIVE, DeviceConfig.NAMESPACE_WINDOW_MANAGER_NATIVE_BOOT, DeviceConfig.NAMESPACE_MEMORY_SAFETY_NATIVE, + DeviceConfig.NAMESPACE_HDMI_CONTROL }; private final String[] mGlobalSettings; |