Fix broken build (9302a733) · Commits · e / os / android_frameworks_base

api/current.txt

+2 −3

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

+3 −3

Original line number	Original line	Diff line number	Diff line
	@@ -114,10 +114,10 @@ public final class HdmiControlManager {
	* Adds a listener to get informed of {@link HdmiHotplugEvent}.		* Adds a listener to get informed of {@link HdmiHotplugEvent}.
	*		*
	* <p>To stop getting the notification,		* <p>To stop getting the notification,
	* use {@link #removeHotplugeEventListener(HotplugEventListener)}.		* use {@link #removeHotplugEventListener(HotplugEventListener)}.
	*		*
	* @param listener {@link HotplugEventListener} instance		* @param listener {@link HotplugEventListener} instance
	* @see HdmiControlManager#removeHotplugeEventListener(HotplugEventListener)		* @see HdmiControlManager#removeHotplugEventListener(HotplugEventListener)
	*/		*/
	public void addHotplugEventListener(HotplugEventListener listener) {		public void addHotplugEventListener(HotplugEventListener listener) {
	if (mService == null) {		if (mService == null) {
	@@ -135,7 +135,7 @@ public final class HdmiControlManager {
	*		*
	* @param listener {@link HotplugEventListener} instance to be removed		* @param listener {@link HotplugEventListener} instance to be removed
	*/		*/
	public void removeHotplugeEventListener(HotplugEventListener listener) {		public void removeHotplugEventListener(HotplugEventListener listener) {
	if (mService == null) {		if (mService == null) {
	return;		return;
	}		}

Original line number	Original line	Diff line number	Diff line
	@@ -12869,7 +12869,7 @@ package android.hardware.hdmi {
	method public void addHotplugEventListener(android.hardware.hdmi.HdmiControlManager.HotplugEventListener);		method public void addHotplugEventListener(android.hardware.hdmi.HdmiControlManager.HotplugEventListener);
	method public android.hardware.hdmi.HdmiPlaybackClient getPlaybackClient();		method public android.hardware.hdmi.HdmiPlaybackClient getPlaybackClient();
	method public android.hardware.hdmi.HdmiTvClient getTvClient();		method public android.hardware.hdmi.HdmiTvClient getTvClient();
	method public void removeHotplugeEventListener(android.hardware.hdmi.HdmiControlManager.HotplugEventListener);		method public void removeHotplugEventListener(android.hardware.hdmi.HdmiControlManager.HotplugEventListener);
	}		}

	public static abstract interface HdmiControlManager.HotplugEventListener {		public static abstract interface HdmiControlManager.HotplugEventListener {
	@@ -12877,7 +12877,6 @@ package android.hardware.hdmi {
	}		}

	public final class HdmiHotplugEvent implements android.os.Parcelable {		public final class HdmiHotplugEvent implements android.os.Parcelable {
	ctor public HdmiHotplugEvent(int, boolean);
	method public int describeContents();		method public int describeContents();
	method public int getPort();		method public int getPort();
	method public boolean isConnected();		method public boolean isConnected();
	@@ -15763,7 +15762,7 @@ package android.media.session {
	method public void setActive(boolean);		method public void setActive(boolean);
	method public void setFlags(int);		method public void setFlags(int);
	method public void setLaunchPendingIntent(android.app.PendingIntent);		method public void setLaunchPendingIntent(android.app.PendingIntent);
	method public void useLocalPlayback(android.media.AudioAttributes);		method public void useLocalPlayback(int);
	method public void useRemotePlayback(android.media.session.RemoteVolumeProvider);		method public void useRemotePlayback(android.media.session.RemoteVolumeProvider);
	field public static final int FLAG_HANDLES_MEDIA_BUTTONS = 1; // 0x1		field public static final int FLAG_HANDLES_MEDIA_BUTTONS = 1; // 0x1
	field public static final int FLAG_HANDLES_TRANSPORT_CONTROLS = 2; // 0x2		field public static final int FLAG_HANDLES_TRANSPORT_CONTROLS = 2; // 0x2