From c833d21bb21333945b391d7c176f0cce4d9b61e6 Mon Sep 17 00:00:00 2001 From: Michal Olech Date: Tue, 5 Oct 2021 13:07:08 +0200 Subject: [PATCH 1/5] [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: From 06e13bdbd5c0b3f8657cc81acd02e2082f4529d5 Mon Sep 17 00:00:00 2001 From: Michal Olech Date: Tue, 5 Oct 2021 13:15:35 +0200 Subject: [PATCH 2/5] [CEC Configuration] Switch VOLUME_CONTROL_MODE to Shared Preferences Test: manual test Change-Id: I708caafc54df8f3c6393b485abdc8e5b02f1ca51 Bug: 175381065 --- core/java/android/provider/Settings.java | 38 ------------------- .../android/provider/SettingsBackupTest.java | 1 - .../android/server/hdmi/HdmiCecConfig.java | 8 +--- 3 files changed, 2 insertions(+), 45 deletions(-) diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index ed5341709539a..6b3f0c057466c 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -11049,44 +11049,6 @@ public final class Settings { @Readable public static final String HDMI_CONTROL_ENABLED = "hdmi_control_enabled"; - /** - * Controls whether volume control commands via HDMI CEC are enabled. (0 = false, 1 = - * true). - * - *

Effects on different device types: - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - *
HDMI CEC device type0: disabled1: enabled
TV (type: 0)Per CEC specification.TV changes system volume. TV no longer reacts to incoming volume changes - * via {@code }. TV no longer handles {@code }.
Playback device (type: 4)Device sends volume commands to TV/Audio system via {@code }Device does not send volume commands via {@code }.
Audio device (type: 5)Full "System Audio Control" capabilities.Audio device no longer reacts to incoming {@code } - * volume commands. Audio device no longer reports volume changes via {@code - * }.
- * - *

Due to the resulting behavior, usage on TV and Audio devices is discouraged. - * - * @hide - * @see android.hardware.hdmi.HdmiControlManager#setHdmiCecVolumeControlEnabled(boolean) - */ - @Readable - public static final String HDMI_CONTROL_VOLUME_CONTROL_ENABLED = - "hdmi_control_volume_control_enabled"; - /** * Whether HDMI System Audio Control feature is enabled. If enabled, TV will try to turn on * system audio mode if there's a connected CEC-enabled AV Receiver. Then audio stream will diff --git a/packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java b/packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java index 50332a2ddc5ca..63623a099cc44 100644 --- a/packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java +++ b/packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java @@ -303,7 +303,6 @@ public class SettingsBackupTest { Settings.Global.HDMI_CONTROL_AUTO_WAKEUP_ENABLED, Settings.Global.HDMI_CONTROL_ENABLED, Settings.Global.HDMI_CONTROL_SEND_STANDBY_ON_SLEEP, - Settings.Global.HDMI_CONTROL_VOLUME_CONTROL_ENABLED, Settings.Global.HDMI_SYSTEM_AUDIO_CONTROL_ENABLED, Settings.Global.HEADS_UP_NOTIFICATIONS_ENABLED, Settings.Global.HIDDEN_API_POLICY, diff --git a/services/core/java/com/android/server/hdmi/HdmiCecConfig.java b/services/core/java/com/android/server/hdmi/HdmiCecConfig.java index 0c68ddcaee7a0..551e919e60ff6 100644 --- a/services/core/java/com/android/server/hdmi/HdmiCecConfig.java +++ b/services/core/java/com/android/server/hdmi/HdmiCecConfig.java @@ -526,7 +526,7 @@ public class HdmiCecConfig { case HdmiControlManager.CEC_SETTING_NAME_POWER_CONTROL_MODE: return STORAGE_GLOBAL_SETTINGS; case HdmiControlManager.CEC_SETTING_NAME_VOLUME_CONTROL_MODE: - return STORAGE_GLOBAL_SETTINGS; + return STORAGE_SHARED_PREFS; case HdmiControlManager.CEC_SETTING_NAME_POWER_STATE_CHANGE_ON_ACTIVE_SOURCE_LOST: return STORAGE_SHARED_PREFS; case HdmiControlManager.CEC_SETTING_NAME_SYSTEM_AUDIO_CONTROL: @@ -567,7 +567,7 @@ public class HdmiCecConfig { case HdmiControlManager.CEC_SETTING_NAME_POWER_CONTROL_MODE: return Global.HDMI_CONTROL_SEND_STANDBY_ON_SLEEP; case HdmiControlManager.CEC_SETTING_NAME_VOLUME_CONTROL_MODE: - return Global.HDMI_CONTROL_VOLUME_CONTROL_ENABLED; + return setting.getName(); case HdmiControlManager.CEC_SETTING_NAME_POWER_STATE_CHANGE_ON_ACTIVE_SOURCE_LOST: return setting.getName(); case HdmiControlManager.CEC_SETTING_NAME_SYSTEM_AUDIO_CONTROL: @@ -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_VOLUME_CONTROL_ENABLED: - notifySettingChanged(HdmiControlManager.CEC_SETTING_NAME_VOLUME_CONTROL_MODE); - break; case Global.HDMI_CONTROL_AUTO_WAKEUP_ENABLED: notifySettingChanged(HdmiControlManager.CEC_SETTING_NAME_TV_WAKE_ON_ONE_TOUCH_PLAY); break; @@ -688,7 +685,6 @@ public class HdmiCecConfig { String[] settings = new String[] { Global.HDMI_CONTROL_ENABLED, Global.HDMI_CONTROL_SEND_STANDBY_ON_SLEEP, - Global.HDMI_CONTROL_VOLUME_CONTROL_ENABLED, Global.HDMI_CONTROL_AUTO_WAKEUP_ENABLED, Global.HDMI_CONTROL_AUTO_DEVICE_OFF_ENABLED, }; From 28b217b77aa5a0da489d106c5a173c3d1c4ffe4c Mon Sep 17 00:00:00 2001 From: Michal Olech Date: Tue, 5 Oct 2021 13:21:05 +0200 Subject: [PATCH 3/5] [CEC Configuration] Switch HDMI_SYSTEM_AUDIO_CONTROL_ENABLED to SharefPrefs Test: manual test Change-Id: Iacca003274238a80720d7abddadcc0d26b34f99f Bug: 175381065 --- core/java/android/provider/Settings.java | 11 ----------- .../providers/settings/SettingsProtoDumpUtil.java | 3 --- .../test/src/android/provider/SettingsBackupTest.java | 1 - .../java/com/android/server/hdmi/HdmiCecConfig.java | 4 ++-- 4 files changed, 2 insertions(+), 17 deletions(-) diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index 6b3f0c057466c..5dcc3f6b2c233 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -11049,17 +11049,6 @@ public final class Settings { @Readable public static final String HDMI_CONTROL_ENABLED = "hdmi_control_enabled"; - /** - * Whether HDMI System Audio Control feature is enabled. If enabled, TV will try to turn on - * system audio mode if there's a connected CEC-enabled AV Receiver. Then audio stream will - * be played on AVR instead of TV spaeker. If disabled, the system audio mode will never be - * activated. - * @hide - */ - @Readable - public static final String HDMI_SYSTEM_AUDIO_CONTROL_ENABLED = - "hdmi_system_audio_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) diff --git a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProtoDumpUtil.java b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProtoDumpUtil.java index 4ac19386db0a6..d8abd33e69258 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_SYSTEM_AUDIO_CONTROL_ENABLED, - GlobalSettingsProto.Hdmi.SYSTEM_AUDIO_CONTROL_ENABLED); dumpSetting(s, p, Settings.Global.HDMI_CONTROL_AUTO_WAKEUP_ENABLED, GlobalSettingsProto.Hdmi.CONTROL_AUTO_WAKEUP_ENABLED); diff --git a/packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java b/packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java index 63623a099cc44..a419cc1be0472 100644 --- a/packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java +++ b/packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java @@ -303,7 +303,6 @@ public class SettingsBackupTest { Settings.Global.HDMI_CONTROL_AUTO_WAKEUP_ENABLED, Settings.Global.HDMI_CONTROL_ENABLED, Settings.Global.HDMI_CONTROL_SEND_STANDBY_ON_SLEEP, - Settings.Global.HDMI_SYSTEM_AUDIO_CONTROL_ENABLED, Settings.Global.HEADS_UP_NOTIFICATIONS_ENABLED, Settings.Global.HIDDEN_API_POLICY, Settings.Global.FORCE_NON_DEBUGGABLE_FINAL_BUILD_FOR_COMPAT, diff --git a/services/core/java/com/android/server/hdmi/HdmiCecConfig.java b/services/core/java/com/android/server/hdmi/HdmiCecConfig.java index 551e919e60ff6..3893f2690ec90 100644 --- a/services/core/java/com/android/server/hdmi/HdmiCecConfig.java +++ b/services/core/java/com/android/server/hdmi/HdmiCecConfig.java @@ -530,7 +530,7 @@ public class HdmiCecConfig { case HdmiControlManager.CEC_SETTING_NAME_POWER_STATE_CHANGE_ON_ACTIVE_SOURCE_LOST: return STORAGE_SHARED_PREFS; case HdmiControlManager.CEC_SETTING_NAME_SYSTEM_AUDIO_CONTROL: - return STORAGE_GLOBAL_SETTINGS; + return STORAGE_SHARED_PREFS; case HdmiControlManager.CEC_SETTING_NAME_SYSTEM_AUDIO_MODE_MUTING: return STORAGE_SHARED_PREFS; case HdmiControlManager.CEC_SETTING_NAME_TV_WAKE_ON_ONE_TOUCH_PLAY: @@ -571,7 +571,7 @@ public class HdmiCecConfig { case HdmiControlManager.CEC_SETTING_NAME_POWER_STATE_CHANGE_ON_ACTIVE_SOURCE_LOST: return setting.getName(); case HdmiControlManager.CEC_SETTING_NAME_SYSTEM_AUDIO_CONTROL: - return Global.HDMI_SYSTEM_AUDIO_CONTROL_ENABLED; + return setting.getName(); case HdmiControlManager.CEC_SETTING_NAME_SYSTEM_AUDIO_MODE_MUTING: return setting.getName(); case HdmiControlManager.CEC_SETTING_NAME_TV_WAKE_ON_ONE_TOUCH_PLAY: From 8a5adf2c64ef879e7eecc76aea7a8707b9b39e55 Mon Sep 17 00:00:00 2001 From: Michal Olech Date: Tue, 5 Oct 2021 13:24:04 +0200 Subject: [PATCH 4/5] [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) { From dcac864c9793b1dbbf3cef35ac057b4b18ee33bd Mon Sep 17 00:00:00 2001 From: Michal Olech Date: Mon, 15 Feb 2021 14:43:55 +0100 Subject: [PATCH 5/5] [CEC Configuration] Switch POWER_CONTROL_MODE to Shared Preferences Test: build; flash; inspect Bug: 171958586 Change-Id: Ic3521f7d2b5764d0ffe599f42822ff7394098afe --- core/java/android/provider/Settings.java | 24 ------------------- .../android/provider/SettingsBackupTest.java | 1 - .../android/server/hdmi/HdmiCecConfig.java | 8 ++----- .../server/hdmi/HdmiCecConfigTest.java | 22 ----------------- 4 files changed, 2 insertions(+), 53 deletions(-) diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index 52dd63d3af5cb..cb4b041d734d1 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -11059,30 +11059,6 @@ public final class Settings { public static final String HDMI_CONTROL_AUTO_DEVICE_OFF_ENABLED = "hdmi_control_auto_device_off_enabled"; - /** - * Property to decide which devices the playback device can send a message to - * upon going to sleep. It additionally controls whether a playback device attempts to turn - * on the connected Audio system when waking up. Supported values are: - *

- * - * @hide - */ - public static final String HDMI_CONTROL_SEND_STANDBY_ON_SLEEP = - "hdmi_control_send_standby_on_sleep"; - /** * Whether or not media is shown automatically when bypassing as a heads up. * @hide diff --git a/packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java b/packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java index 609e1a4da9fc7..3c700dca70e2d 100644 --- a/packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java +++ b/packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java @@ -301,7 +301,6 @@ public class SettingsBackupTest { Settings.Global.GPRS_REGISTER_CHECK_PERIOD_MS, Settings.Global.HDMI_CONTROL_AUTO_DEVICE_OFF_ENABLED, Settings.Global.HDMI_CONTROL_ENABLED, - Settings.Global.HDMI_CONTROL_SEND_STANDBY_ON_SLEEP, Settings.Global.HEADS_UP_NOTIFICATIONS_ENABLED, Settings.Global.HIDDEN_API_POLICY, Settings.Global.FORCE_NON_DEBUGGABLE_FINAL_BUILD_FOR_COMPAT, diff --git a/services/core/java/com/android/server/hdmi/HdmiCecConfig.java b/services/core/java/com/android/server/hdmi/HdmiCecConfig.java index 47331cb248170..cf8cc38bd188d 100644 --- a/services/core/java/com/android/server/hdmi/HdmiCecConfig.java +++ b/services/core/java/com/android/server/hdmi/HdmiCecConfig.java @@ -524,7 +524,7 @@ public class HdmiCecConfig { case HdmiControlManager.CEC_SETTING_NAME_ROUTING_CONTROL: return STORAGE_SHARED_PREFS; case HdmiControlManager.CEC_SETTING_NAME_POWER_CONTROL_MODE: - return STORAGE_GLOBAL_SETTINGS; + return STORAGE_SHARED_PREFS; case HdmiControlManager.CEC_SETTING_NAME_VOLUME_CONTROL_MODE: return STORAGE_SHARED_PREFS; case HdmiControlManager.CEC_SETTING_NAME_POWER_STATE_CHANGE_ON_ACTIVE_SOURCE_LOST: @@ -565,7 +565,7 @@ public class HdmiCecConfig { case HdmiControlManager.CEC_SETTING_NAME_ROUTING_CONTROL: return setting.getName(); case HdmiControlManager.CEC_SETTING_NAME_POWER_CONTROL_MODE: - return Global.HDMI_CONTROL_SEND_STANDBY_ON_SLEEP; + return setting.getName(); case HdmiControlManager.CEC_SETTING_NAME_VOLUME_CONTROL_MODE: return setting.getName(); case HdmiControlManager.CEC_SETTING_NAME_POWER_STATE_CHANGE_ON_ACTIVE_SOURCE_LOST: @@ -634,9 +634,6 @@ public class HdmiCecConfig { case Global.HDMI_CONTROL_ENABLED: notifySettingChanged(HdmiControlManager.CEC_SETTING_NAME_HDMI_CEC_ENABLED); break; - case Global.HDMI_CONTROL_SEND_STANDBY_ON_SLEEP: - notifySettingChanged(HdmiControlManager.CEC_SETTING_NAME_POWER_CONTROL_MODE); - break; case Global.HDMI_CONTROL_AUTO_DEVICE_OFF_ENABLED: notifySettingChanged(HdmiControlManager.CEC_SETTING_NAME_TV_SEND_STANDBY_ON_SLEEP); break; @@ -681,7 +678,6 @@ public class HdmiCecConfig { ContentResolver resolver = mContext.getContentResolver(); String[] settings = new String[] { Global.HDMI_CONTROL_ENABLED, - Global.HDMI_CONTROL_SEND_STANDBY_ON_SLEEP, Global.HDMI_CONTROL_AUTO_DEVICE_OFF_ENABLED, }; for (String setting: settings) { diff --git a/services/tests/servicestests/src/com/android/server/hdmi/HdmiCecConfigTest.java b/services/tests/servicestests/src/com/android/server/hdmi/HdmiCecConfigTest.java index a94690e71eb48..c1d9857e23d79 100644 --- a/services/tests/servicestests/src/com/android/server/hdmi/HdmiCecConfigTest.java +++ b/services/tests/servicestests/src/com/android/server/hdmi/HdmiCecConfigTest.java @@ -338,18 +338,6 @@ public final class HdmiCecConfigTest { HdmiControlManager.CEC_SETTING_NAME_HDMI_CEC_ENABLED)); } - @Test - public void getStringValue_GlobalSetting_BasicSanity() { - when(mStorageAdapter.retrieveGlobalSetting( - Global.HDMI_CONTROL_SEND_STANDBY_ON_SLEEP, - HdmiControlManager.POWER_CONTROL_MODE_TV_AND_AUDIO_SYSTEM)) - .thenReturn(HdmiControlManager.POWER_CONTROL_MODE_BROADCAST); - HdmiCecConfig hdmiCecConfig = new HdmiCecConfig(mContext, mStorageAdapter); - assertThat(hdmiCecConfig.getStringValue( - HdmiControlManager.CEC_SETTING_NAME_POWER_CONTROL_MODE)) - .isEqualTo(HdmiControlManager.POWER_CONTROL_MODE_BROADCAST); - } - @Test public void getStringValue_SharedPref_BasicSanity() { when(mStorageAdapter.retrieveSharedPref( @@ -428,16 +416,6 @@ public final class HdmiCecConfigTest { "bar")); } - @Test - public void setStringValue_GlobalSetting_BasicSanity() { - HdmiCecConfig hdmiCecConfig = new HdmiCecConfig(mContext, mStorageAdapter); - hdmiCecConfig.setStringValue(HdmiControlManager.CEC_SETTING_NAME_POWER_CONTROL_MODE, - HdmiControlManager.POWER_CONTROL_MODE_BROADCAST); - verify(mStorageAdapter).storeGlobalSetting( - Global.HDMI_CONTROL_SEND_STANDBY_ON_SLEEP, - HdmiControlManager.POWER_CONTROL_MODE_BROADCAST); - } - @Test public void setStringValue_SharedPref_BasicSanity() { HdmiCecConfig hdmiCecConfig = new HdmiCecConfig(mContext, mStorageAdapter);