Merge "CEC: Drop TODOs marked as fixed/obsolete" (6e7f16ac) · Commits · e / os / android_frameworks_base

core/java/android/hardware/hdmi/HdmiAudioSystemClient.java

+0 −4

Original line number	Diff line number	Diff line
		@@ -63,7 +63,6 @@ public final class HdmiAudioSystemClient extends HdmiClient {
		*
		* @hide
		*/
		// TODO(b/110094868): unhide and add @SystemApi for Q
		public interface SetSystemAudioModeCallback {
		/**
		* Called when the input was changed.
		@@ -74,7 +73,6 @@ public final class HdmiAudioSystemClient extends HdmiClient {
		}

		/** @hide */
		// TODO(b/110094868): unhide and add @SystemApi for Q
		@Override
		public int getDeviceType() {
		return HdmiDeviceInfo.DEVICE_AUDIO_SYSTEM;
		@@ -143,7 +141,6 @@ public final class HdmiAudioSystemClient extends HdmiClient {
		*
		* @hide
		*/
		// TODO(b/110094868): unhide and add @SystemApi for Q
		public void setSystemAudioMode(boolean state, @NonNull SetSystemAudioModeCallback callback) {
		// TODO(amyjojo): implement this when needed.
		}
		@@ -156,7 +153,6 @@ public final class HdmiAudioSystemClient extends HdmiClient {
		*
		* @hide
		*/
		// TODO(b/110094868): unhide and add @SystemApi for Q
		public void setSystemAudioModeOnForAudioOnlySource() {
		try {
		mService.setSystemAudioModeOnForAudioOnlySource();

core/java/android/hardware/hdmi/HdmiClient.java

+0 −1

Original line number	Diff line number	Diff line
		@@ -65,7 +65,6 @@ public abstract class HdmiClient {
		* @param isPressed true if this is key press event
		*
		* @hide
		* TODO(b/110094868): unhide for Q
		*/
		public void sendVolumeKeyEvent(int keyCode, boolean isPressed) {
		try {

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

+0 −1

Original line number	Diff line number	Diff line
		@@ -472,7 +472,6 @@ public final class HdmiControlManager {
		*
		* @return {@link HdmiAudioSystemClient} instance. {@code null} on failure.
		*
		* TODO(b/110094868): unhide for Q
		* @hide
		*/
		@Nullable

core/java/android/hardware/hdmi/HdmiUtils.java

+8 −10

Original line number	Diff line number	Diff line
		@@ -24,7 +24,6 @@ import java.lang.annotation.RetentionPolicy;
		/**
		* Various utilities related to HDMI CEC.
		*
		* TODO(b/110094868): unhide for Q
		* @hide
		*/
		public final class HdmiUtils {
		@@ -84,7 +83,6 @@ public final class HdmiUtils {
		}

		/**
		* TODO(b/110094868): unhide for Q
		* @hide
		*/
		@Retention(RetentionPolicy.SOURCE)
		@@ -95,49 +93,49 @@ public final class HdmiUtils {
		public @interface HdmiAddressRelativePosition {}
		/**
		* HDMI relative position is not determined.
		* TODO(b/110094868): unhide for Q
		*
		* @hide
		*/
		public static final int HDMI_RELATIVE_POSITION_UNKNOWN = 0;
		/**
		* HDMI relative position: directly blow the device.
		* TODO(b/110094868): unhide for Q
		*
		* @hide
		*/
		public static final int HDMI_RELATIVE_POSITION_DIRECTLY_BELOW = 1;
		/**
		* HDMI relative position: indirectly below the device.
		* TODO(b/110094868): unhide for Q
		*
		* @hide
		*/
		public static final int HDMI_RELATIVE_POSITION_BELOW = 2;
		/**
		* HDMI relative position: the same device.
		* TODO(b/110094868): unhide for Q
		*
		* @hide
		*/
		public static final int HDMI_RELATIVE_POSITION_SAME = 3;
		/**
		* HDMI relative position: directly above the device.
		* TODO(b/110094868): unhide for Q
		*
		* @hide
		*/
		public static final int HDMI_RELATIVE_POSITION_DIRECTLY_ABOVE = 4;
		/**
		* HDMI relative position: indirectly above the device.
		* TODO(b/110094868): unhide for Q
		*
		* @hide
		*/
		public static final int HDMI_RELATIVE_POSITION_ABOVE = 5;
		/**
		* HDMI relative position: directly below a same device.
		* TODO(b/110094868): unhide for Q
		*
		* @hide
		*/
		public static final int HDMI_RELATIVE_POSITION_SIBLING = 6;
		/**
		* HDMI relative position: different branch.
		* TODO(b/110094868): unhide for Q
		*
		* @hide
		*/
		public static final int HDMI_RELATIVE_POSITION_DIFFERENT_BRANCH = 7;

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

+0 −2

Original line number	Diff line number	Diff line
		@@ -353,7 +353,6 @@ public class HdmiCecLocalDeviceAudioSystem extends HdmiCecLocalDeviceSource {
		super.disableDevice(initiatedByCec, callback);
		assertRunOnServiceThread();
		mService.unregisterTvInputCallback(mTvInputCallback);
		// TODO(b/129088603): check disableDevice and onStandby behaviors per spec
		}

		@Override
		@@ -1046,7 +1045,6 @@ public class HdmiCecLocalDeviceAudioSystem extends HdmiCecLocalDeviceSource {
		}

		protected void switchToAudioInput() {
		// TODO(b/111396634): switch input according to PROPERTY_SYSTEM_AUDIO_MODE_AUDIO_PORT
		}

		protected boolean isDirectConnectToTv() {