From dcac864c9793b1dbbf3cef35ac057b4b18ee33bd Mon Sep 17 00:00:00 2001 From: Michal Olech Date: Mon, 15 Feb 2021 14:43:55 +0100 Subject: [PATCH] [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);