From 8a5adf2c64ef879e7eecc76aea7a8707b9b39e55 Mon Sep 17 00:00:00 2001 From: Michal Olech Date: Tue, 5 Oct 2021 13:24:04 +0200 Subject: [PATCH] [CEC Configuration] Switch TV_WAKE_ON_ONE_TOUCH_PLAY to SharedPrefs Test: manual test Change-Id: Ic3f0eaa07f89ba317581ede56a74e99b5c38cbe1 Bug: 175381065 --- core/java/android/provider/Settings.java | 10 ---------- .../providers/settings/SettingsProtoDumpUtil.java | 3 --- .../test/src/android/provider/SettingsBackupTest.java | 1 - .../java/com/android/server/hdmi/HdmiCecConfig.java | 8 ++------ 4 files changed, 2 insertions(+), 20 deletions(-) diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index 5dcc3f6b2c233..52dd63d3af5cb 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -11049,16 +11049,6 @@ public final class Settings { @Readable public static final String HDMI_CONTROL_ENABLED = "hdmi_control_enabled"; - /** - * Whether TV will automatically turn on upon reception of the CEC command - * <Text View On> or <Image View On>. (0 = false, 1 = true) - * - * @hide - */ - @Readable - public static final String HDMI_CONTROL_AUTO_WAKEUP_ENABLED = - "hdmi_control_auto_wakeup_enabled"; - /** * Whether TV will also turn off other CEC devices when it goes to standby mode. * (0 = false, 1 = true) diff --git a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProtoDumpUtil.java b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProtoDumpUtil.java index d8abd33e69258..cbee9827cefa0 100644 --- a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProtoDumpUtil.java +++ b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProtoDumpUtil.java @@ -804,9 +804,6 @@ class SettingsProtoDumpUtil { dumpSetting(s, p, Settings.Global.HDMI_CONTROL_ENABLED, GlobalSettingsProto.Hdmi.CONTROL_ENABLED); - dumpSetting(s, p, - Settings.Global.HDMI_CONTROL_AUTO_WAKEUP_ENABLED, - GlobalSettingsProto.Hdmi.CONTROL_AUTO_WAKEUP_ENABLED); dumpSetting(s, p, Settings.Global.HDMI_CONTROL_AUTO_DEVICE_OFF_ENABLED, GlobalSettingsProto.Hdmi.CONTROL_AUTO_DEVICE_OFF_ENABLED); diff --git a/packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java b/packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java index a419cc1be0472..609e1a4da9fc7 100644 --- a/packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java +++ b/packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java @@ -300,7 +300,6 @@ public class SettingsBackupTest { Settings.Global.GNSS_SATELLITE_BLOCKLIST, Settings.Global.GPRS_REGISTER_CHECK_PERIOD_MS, Settings.Global.HDMI_CONTROL_AUTO_DEVICE_OFF_ENABLED, - Settings.Global.HDMI_CONTROL_AUTO_WAKEUP_ENABLED, Settings.Global.HDMI_CONTROL_ENABLED, Settings.Global.HDMI_CONTROL_SEND_STANDBY_ON_SLEEP, Settings.Global.HEADS_UP_NOTIFICATIONS_ENABLED, diff --git a/services/core/java/com/android/server/hdmi/HdmiCecConfig.java b/services/core/java/com/android/server/hdmi/HdmiCecConfig.java index 3893f2690ec90..47331cb248170 100644 --- a/services/core/java/com/android/server/hdmi/HdmiCecConfig.java +++ b/services/core/java/com/android/server/hdmi/HdmiCecConfig.java @@ -534,7 +534,7 @@ public class HdmiCecConfig { case HdmiControlManager.CEC_SETTING_NAME_SYSTEM_AUDIO_MODE_MUTING: return STORAGE_SHARED_PREFS; case HdmiControlManager.CEC_SETTING_NAME_TV_WAKE_ON_ONE_TOUCH_PLAY: - return STORAGE_GLOBAL_SETTINGS; + return STORAGE_SHARED_PREFS; case HdmiControlManager.CEC_SETTING_NAME_TV_SEND_STANDBY_ON_SLEEP: return STORAGE_GLOBAL_SETTINGS; case HdmiControlManager.CEC_SETTING_NAME_RC_PROFILE_TV: @@ -575,7 +575,7 @@ public class HdmiCecConfig { case HdmiControlManager.CEC_SETTING_NAME_SYSTEM_AUDIO_MODE_MUTING: return setting.getName(); case HdmiControlManager.CEC_SETTING_NAME_TV_WAKE_ON_ONE_TOUCH_PLAY: - return Global.HDMI_CONTROL_AUTO_WAKEUP_ENABLED; + return setting.getName(); case HdmiControlManager.CEC_SETTING_NAME_TV_SEND_STANDBY_ON_SLEEP: return Global.HDMI_CONTROL_AUTO_DEVICE_OFF_ENABLED; case HdmiControlManager.CEC_SETTING_NAME_RC_PROFILE_TV: @@ -637,9 +637,6 @@ public class HdmiCecConfig { case Global.HDMI_CONTROL_SEND_STANDBY_ON_SLEEP: notifySettingChanged(HdmiControlManager.CEC_SETTING_NAME_POWER_CONTROL_MODE); break; - case Global.HDMI_CONTROL_AUTO_WAKEUP_ENABLED: - notifySettingChanged(HdmiControlManager.CEC_SETTING_NAME_TV_WAKE_ON_ONE_TOUCH_PLAY); - break; case Global.HDMI_CONTROL_AUTO_DEVICE_OFF_ENABLED: notifySettingChanged(HdmiControlManager.CEC_SETTING_NAME_TV_SEND_STANDBY_ON_SLEEP); break; @@ -685,7 +682,6 @@ public class HdmiCecConfig { String[] settings = new String[] { Global.HDMI_CONTROL_ENABLED, Global.HDMI_CONTROL_SEND_STANDBY_ON_SLEEP, - Global.HDMI_CONTROL_AUTO_WAKEUP_ENABLED, Global.HDMI_CONTROL_AUTO_DEVICE_OFF_ENABLED, }; for (String setting: settings) {