From 93d190d65aa07a3f272b796e6a5c44b2e282612b Mon Sep 17 00:00:00 2001 From: Paul Colta Date: Wed, 23 Nov 2022 10:39:18 +0100 Subject: [PATCH] HDMI: Add new DeviceConfig namespace for HDMI Control features Add feature flag namespace string in DeviceConfig class. Bug: 260193335 Test: make Change-Id: I5539f373771eebd6a5b6dc91f57aa1aee902e246 --- core/api/system-current.txt | 1 + core/java/android/provider/DeviceConfig.java | 8 ++++++++ .../com/android/server/am/SettingsToPropertiesMapper.java | 1 + 3 files changed, 10 insertions(+) diff --git a/core/api/system-current.txt b/core/api/system-current.txt index 99be1a2ef3045..ac97ac6bcbee6 100644 --- a/core/api/system-current.txt +++ b/core/api/system-current.txt @@ -10556,6 +10556,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 19e7bd4e748bd..ca88ae306c590 100644 --- a/core/java/android/provider/DeviceConfig.java +++ b/core/java/android/provider/DeviceConfig.java @@ -261,6 +261,14 @@ public final class DeviceConfig { @SystemApi 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 f16347f33f719..f22624c32676a 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;