Merge "Rename send_standby_on_sleep in constants and methods" (0d3d16b4) · Commits · e / os / android_frameworks_base

core/java/android/hardware/hdmi/HdmiControlManager.java

+21 −21

Original line number	Diff line number	Diff line
		@@ -367,35 +367,35 @@ public final class HdmiControlManager {
		@Retention(RetentionPolicy.SOURCE)
		public @interface HdmiCecVersion {}

		// -- Which devices the playback device can send a <Standby> message to upon going to sleep.
		// -- Scope of CEC power control messages sent by a playback device.
		/**
		* Send <Standby> to TV only.
		* Send CEC power control messages to TV only.
		*
		* @hide
		*/
		public static final String SEND_STANDBY_ON_SLEEP_TO_TV = "to_tv";
		public static final String POWER_CONTROL_MODE_TV = "to_tv";
		/**
		* Broadcast <Standby> to all devices in the network.
		* Broadcast CEC power control messages to all devices in the network.
		*
		* @hide
		*/
		public static final String SEND_STANDBY_ON_SLEEP_BROADCAST = "broadcast";
		public static final String POWER_CONTROL_MODE_BROADCAST = "broadcast";
		/**
		* Don't send any <Standby> message.
		* Don't send any CEC power control messages.
		*
		* @hide
		*/
		public static final String SEND_STANDBY_ON_SLEEP_NONE = "none";
		public static final String POWER_CONTROL_MODE_NONE = "none";
		/**
		* @hide
		*/
		@StringDef({
		SEND_STANDBY_ON_SLEEP_TO_TV,
		SEND_STANDBY_ON_SLEEP_BROADCAST,
		SEND_STANDBY_ON_SLEEP_NONE
		POWER_CONTROL_MODE_TV,
		POWER_CONTROL_MODE_BROADCAST,
		POWER_CONTROL_MODE_NONE
		})
		@Retention(RetentionPolicy.SOURCE)
		public @interface StandbyBehavior {}
		public @interface PowerControlMode {}

		// -- Which power state action should be taken when Active Source is lost.
		/**
		@@ -457,11 +457,11 @@ public final class HdmiControlManager {
		*/
		public static final String CEC_SETTING_NAME_HDMI_CEC_VERSION = "hdmi_cec_version";
		/**
		* Name of a setting deciding on the Standby message behaviour on sleep.
		* Name of a setting deciding on the power control mode.
		*
		* @hide
		*/
		public static final String CEC_SETTING_NAME_SEND_STANDBY_ON_SLEEP = "send_standby_on_sleep";
		public static final String CEC_SETTING_NAME_POWER_CONTROL_MODE = "send_standby_on_sleep";
		/**
		* Name of a setting deciding on power state action when losing Active Source.
		*
		@@ -482,7 +482,7 @@ public final class HdmiControlManager {
		@StringDef({
		CEC_SETTING_NAME_HDMI_CEC_ENABLED,
		CEC_SETTING_NAME_HDMI_CEC_VERSION,
		CEC_SETTING_NAME_SEND_STANDBY_ON_SLEEP,
		CEC_SETTING_NAME_POWER_CONTROL_MODE,
		CEC_SETTING_NAME_POWER_STATE_CHANGE_ON_ACTIVE_SOURCE_LOST,
		CEC_SETTING_NAME_SYSTEM_AUDIO_MODE_MUTING,
		})
		@@ -1506,7 +1506,7 @@ public final class HdmiControlManager {
		}

		/**
		* Set the 'send_standby_on_sleep' option.
		* Set the 'power_control_mode' option.
		*
		* @param value the desired value
		* @throws IllegalArgumentException when the new value is not allowed.
		@@ -1515,20 +1515,20 @@ public final class HdmiControlManager {
		* @hide
		*/
		@RequiresPermission(android.Manifest.permission.HDMI_CEC)
		public void setSendStandbyOnSleep(@NonNull @StandbyBehavior String value) {
		public void setPowerControlMode(@NonNull @PowerControlMode String value) {
		if (mService == null) {
		Log.e(TAG, "HdmiControlService is not available");
		throw new RuntimeException("HdmiControlService is not available");
		}
		try {
		mService.setCecSettingStringValue(CEC_SETTING_NAME_SEND_STANDBY_ON_SLEEP, value);
		mService.setCecSettingStringValue(CEC_SETTING_NAME_POWER_CONTROL_MODE, value);
		} catch (RemoteException e) {
		throw e.rethrowFromSystemServer();
		}
		}

		/**
		* Get the value of 'send_standby_on_sleep' option.
		* Get the value of 'power_control_mode' option.
		*
		* @return the current value.
		* @throws RuntimeException when the HdmiControlService is not available.
		@@ -1536,15 +1536,15 @@ public final class HdmiControlManager {
		* @hide
		*/
		@NonNull
		@StandbyBehavior
		@PowerControlMode
		@RequiresPermission(android.Manifest.permission.HDMI_CEC)
		public String getSendStandbyOnSleep() {
		public String getPowerControlMode() {
		if (mService == null) {
		Log.e(TAG, "HdmiControlService is not available");
		throw new RuntimeException("HdmiControlService is not available");
		}
		try {
		return mService.getCecSettingStringValue(CEC_SETTING_NAME_SEND_STANDBY_ON_SLEEP);
		return mService.getCecSettingStringValue(CEC_SETTING_NAME_POWER_CONTROL_MODE);
		} catch (RemoteException e) {
		throw e.rethrowFromSystemServer();
		}

core/java/android/provider/Settings.java

+3 −3

Original line number	Diff line number	Diff line
		@@ -9962,13 +9962,13 @@ public final class Settings {
		* 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#SEND_STANDBY_ON_SLEEP_TO_TV} Upon going to sleep, device
		* <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#SEND_STANDBY_ON_SLEEP_BROADCAST} Upon going to sleep,
		* <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#SEND_STANDBY_ON_SLEEP_NONE} Upon going to sleep, device
		* <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>

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

+2 −2

Original line number	Diff line number	Diff line
		@@ -253,7 +253,7 @@ public class HdmiCecConfig {
		return STORAGE_GLOBAL_SETTINGS;
		case HdmiControlManager.CEC_SETTING_NAME_HDMI_CEC_VERSION:
		return STORAGE_GLOBAL_SETTINGS;
		case HdmiControlManager.CEC_SETTING_NAME_SEND_STANDBY_ON_SLEEP:
		case HdmiControlManager.CEC_SETTING_NAME_POWER_CONTROL_MODE:
		return STORAGE_GLOBAL_SETTINGS;
		case HdmiControlManager.CEC_SETTING_NAME_POWER_STATE_CHANGE_ON_ACTIVE_SOURCE_LOST:
		return STORAGE_SHARED_PREFS;
		@@ -271,7 +271,7 @@ public class HdmiCecConfig {
		return Global.HDMI_CONTROL_ENABLED;
		case HdmiControlManager.CEC_SETTING_NAME_HDMI_CEC_VERSION:
		return Global.HDMI_CEC_VERSION;
		case HdmiControlManager.CEC_SETTING_NAME_SEND_STANDBY_ON_SLEEP:
		case HdmiControlManager.CEC_SETTING_NAME_POWER_CONTROL_MODE:
		return Global.HDMI_CONTROL_SEND_STANDBY_ON_SLEEP;
		case HdmiControlManager.CEC_SETTING_NAME_POWER_STATE_CHANGE_ON_ACTIVE_SOURCE_LOST:
		return setting.getName();

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

+5 −5

Original line number	Diff line number	Diff line
		@@ -160,20 +160,20 @@ public class HdmiCecLocalDevicePlayback extends HdmiCecLocalDeviceSource {
		switch (standbyAction) {
		case HdmiControlService.STANDBY_SCREEN_OFF:
		// Get latest setting value
		@HdmiControlManager.StandbyBehavior
		@HdmiControlManager.PowerControlMode
		String sendStandbyOnSleep = mService.getHdmiCecConfig().getStringValue(
		HdmiControlManager.CEC_SETTING_NAME_SEND_STANDBY_ON_SLEEP);
		HdmiControlManager.CEC_SETTING_NAME_POWER_CONTROL_MODE);
		switch (sendStandbyOnSleep) {
		case HdmiControlManager.SEND_STANDBY_ON_SLEEP_TO_TV:
		case HdmiControlManager.POWER_CONTROL_MODE_TV:
		mService.sendCecCommand(
		HdmiCecMessageBuilder.buildStandby(mAddress, Constants.ADDR_TV));
		break;
		case HdmiControlManager.SEND_STANDBY_ON_SLEEP_BROADCAST:
		case HdmiControlManager.POWER_CONTROL_MODE_BROADCAST:
		mService.sendCecCommand(
		HdmiCecMessageBuilder.buildStandby(mAddress,
		Constants.ADDR_BROADCAST));
		break;
		case HdmiControlManager.SEND_STANDBY_ON_SLEEP_NONE:
		case HdmiControlManager.POWER_CONTROL_MODE_NONE:
		break;
		}
		break;

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

+2 −2

Original line number	Diff line number	Diff line
		@@ -107,8 +107,8 @@ abstract class HdmiCecLocalDeviceSource extends HdmiCecLocalDevice {
		protected void sendStandby(int deviceId) {
		assertRunOnServiceThread();
		String sendStandbyOnSleep = mService.getHdmiCecConfig().getStringValue(
		HdmiControlManager.CEC_SETTING_NAME_SEND_STANDBY_ON_SLEEP);
		if (sendStandbyOnSleep.equals(HdmiControlManager.SEND_STANDBY_ON_SLEEP_BROADCAST)) {
		HdmiControlManager.CEC_SETTING_NAME_POWER_CONTROL_MODE);
		if (sendStandbyOnSleep.equals(HdmiControlManager.POWER_CONTROL_MODE_BROADCAST)) {
		mService.sendCecCommand(
		HdmiCecMessageBuilder.buildStandby(mAddress, Constants.ADDR_BROADCAST));
		return;