[CEC Configuration] Switch POWER_CONTROL_MODE to Shared Preferences (dcac864c) · Commits · e / os / android_frameworks_base

core/java/android/provider/Settings.java

+0 −24

Original line number	Diff line number	Diff line
		@@ -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 <Standby> 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:
		* <ul>
		* <li>{@link HdmiControlManager#POWER_CONTROL_MODE_TV} Upon going to sleep, device
		* sends {@code <Standby>} to TV only. Upon waking up, device does not turn on the Audio
		* system via {@code <System Audio Mode Request>}.</li>
		* <li>{@link HdmiControlManager#POWER_CONTROL_MODE_TV_AND_AUDIO_SYSTEM} Upon going to
		* sleep, sends {@code <Standby>} to TV and Audio system. Upon waking up, device attempts
		* to turn on the Audio system via {@code <System Audio Mode Request>}.</li>
		* <li>{@link HdmiControlManager#POWER_CONTROL_MODE_BROADCAST} Upon going to sleep,
		* device sends {@code <Standby>} to all devices in the network. Upon waking up, device
		* attempts to turn on the Audio system via {@code <System Audio Mode Request>}.</li>
		* <li>{@link HdmiControlManager#POWER_CONTROL_MODE_NONE} Upon going to sleep, device
		* does not send any {@code <Standby>} message. Upon waking up, device does not turn on the
		* Audio system via {@code <System Audio Mode Request>}.</li>
		* </ul>
		*
		* @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

packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java

+0 −1

Original line number	Diff line number	Diff line
		@@ -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,

services/core/java/com/android/server/hdmi/HdmiCecConfig.java

+2 −6

Original line number	Diff line number	Diff line
		@@ -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) {

services/tests/servicestests/src/com/android/server/hdmi/HdmiCecConfigTest.java

+0 −22

Original line number	Diff line number	Diff line
		@@ -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);