Merge "HDMICEC: Expose HdmiControlManager#getPortInfo API" (d567dc56) · Commits · e / os / android_frameworks_base

core/api/system-current.txt

+2 −1

Original line number	Diff line number	Diff line
		@@ -4165,6 +4165,7 @@ package android.hardware.hdmi {
		method @RequiresPermission(android.Manifest.permission.HDMI_CEC) public int getHdmiCecVolumeControlEnabled();
		method public int getPhysicalAddress();
		method @Nullable public android.hardware.hdmi.HdmiPlaybackClient getPlaybackClient();
		method @NonNull public java.util.List<android.hardware.hdmi.HdmiPortInfo> getPortInfo();
		method @NonNull @RequiresPermission(android.Manifest.permission.HDMI_CEC) public String getPowerControlMode();
		method @NonNull @RequiresPermission(android.Manifest.permission.HDMI_CEC) public String getPowerStateChangeOnActiveSourceLost();
		method @NonNull @RequiresPermission(android.Manifest.permission.HDMI_CEC) public int getRoutingControl();
		@@ -4468,7 +4469,7 @@ package android.hardware.hdmi {

		public class HdmiSwitchClient extends android.hardware.hdmi.HdmiClient {
		method public int getDeviceType();
		method @NonNull public java.util.List<android.hardware.hdmi.HdmiPortInfo> getPortInfo();
		method @Deprecated @NonNull public java.util.List<android.hardware.hdmi.HdmiPortInfo> getPortInfo();
		method public void selectPort(int, @NonNull android.hardware.hdmi.HdmiSwitchClient.OnSelectListener);
		method public void selectPort(int, @NonNull java.util.concurrent.Executor, @NonNull android.hardware.hdmi.HdmiSwitchClient.OnSelectListener);
		}

+16 −0

Original line number	Diff line number	Diff line
		@@ -1290,6 +1290,22 @@ public final class HdmiControlManager {
		}
		}

		/**
		* Get the list of the HDMI ports configuration.
		*
		* <p>This returns an empty list when the current device does not have HDMI ports.
		*
		* @return a list of {@link HdmiPortInfo}
		*/
		@NonNull
		public List<HdmiPortInfo> getPortInfo() {
		try {
		return mService.getPortInfo();
		} catch (RemoteException e) {
		throw e.rethrowFromSystemServer();
		}
		}

		/**
		* Power off the target device by sending CEC commands. Note that this device can't be the
		* current device itself.

+3 −0

Original line number	Diff line number	Diff line
		@@ -184,7 +184,10 @@ public class HdmiSwitchClient extends HdmiClient {
		* <p>This returns an empty list when the current device does not have HDMI input.
		*
		* @return a list of {@link HdmiPortInfo}
		*
		* @deprecated Please use {@link HdmiControlManager#getPortInfo()} instead.
		*/
		@Deprecated
		@NonNull
		public List<HdmiPortInfo> getPortInfo() {
		try {