From c833d21bb21333945b391d7c176f0cce4d9b61e6 Mon Sep 17 00:00:00 2001 From: Michal Olech Date: Tue, 5 Oct 2021 13:07:08 +0200 Subject: [PATCH] [CEC Configuration] Switch ROUTING_CONTROL setting to SharedPrefs Test: manual test Change-Id: Id94165b4df3cb83a39334cb8d750bbbc899186ca Bug: 175381065 --- core/java/android/provider/Settings.java | 10 ---------- .../test/src/android/provider/SettingsBackupTest.java | 1 - .../java/com/android/server/hdmi/HdmiCecConfig.java | 4 ++-- 3 files changed, 2 insertions(+), 13 deletions(-) diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index cbd405e3e7ea2..ed5341709539a 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -11098,16 +11098,6 @@ public final class Settings { public static final String HDMI_SYSTEM_AUDIO_CONTROL_ENABLED = "hdmi_system_audio_control_enabled"; - /** - * Whether HDMI Routing Control feature is enabled. If enabled, the switch device will - * route to the correct input source on receiving Routing Control related messages. If - * disabled, you can only switch the input via controls on this device. - * @hide - */ - @Readable - public static final String HDMI_CEC_SWITCH_ENABLED = - "hdmi_cec_switch_enabled"; - /** * Whether TV will automatically turn on upon reception of the CEC command * <Text View On> or <Image View On>. (0 = false, 1 = true) diff --git a/packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java b/packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java index df7bf20af9f38..50332a2ddc5ca 100644 --- a/packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java +++ b/packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java @@ -299,7 +299,6 @@ public class SettingsBackupTest { Settings.Global.GNSS_HAL_LOCATION_REQUEST_DURATION_MILLIS, Settings.Global.GNSS_SATELLITE_BLOCKLIST, Settings.Global.GPRS_REGISTER_CHECK_PERIOD_MS, - Settings.Global.HDMI_CEC_SWITCH_ENABLED, Settings.Global.HDMI_CONTROL_AUTO_DEVICE_OFF_ENABLED, Settings.Global.HDMI_CONTROL_AUTO_WAKEUP_ENABLED, Settings.Global.HDMI_CONTROL_ENABLED, diff --git a/services/core/java/com/android/server/hdmi/HdmiCecConfig.java b/services/core/java/com/android/server/hdmi/HdmiCecConfig.java index 5de89c9a9cff9..0c68ddcaee7a0 100644 --- a/services/core/java/com/android/server/hdmi/HdmiCecConfig.java +++ b/services/core/java/com/android/server/hdmi/HdmiCecConfig.java @@ -522,7 +522,7 @@ public class HdmiCecConfig { case HdmiControlManager.CEC_SETTING_NAME_HDMI_CEC_VERSION: return STORAGE_SHARED_PREFS; case HdmiControlManager.CEC_SETTING_NAME_ROUTING_CONTROL: - return STORAGE_GLOBAL_SETTINGS; + return STORAGE_SHARED_PREFS; case HdmiControlManager.CEC_SETTING_NAME_POWER_CONTROL_MODE: return STORAGE_GLOBAL_SETTINGS; case HdmiControlManager.CEC_SETTING_NAME_VOLUME_CONTROL_MODE: @@ -563,7 +563,7 @@ public class HdmiCecConfig { case HdmiControlManager.CEC_SETTING_NAME_HDMI_CEC_VERSION: return setting.getName(); case HdmiControlManager.CEC_SETTING_NAME_ROUTING_CONTROL: - return Global.HDMI_CEC_SWITCH_ENABLED; + return setting.getName(); case HdmiControlManager.CEC_SETTING_NAME_POWER_CONTROL_MODE: return Global.HDMI_CONTROL_SEND_STANDBY_ON_SLEEP; case HdmiControlManager.CEC_SETTING_NAME_VOLUME_CONTROL_MODE: