summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJinsuk Kim <jinsukkim@google.com>2014-05-22 13:24:55 +0900
committerJinsuk Kim <jinsukkim@google.com>2014-05-22 04:35:08 +0000
commit9302a733b01c3ab4abd7911a286baf4833847d56 (patch)
tree351da72e9eedda1add109cfd78823826db496ce3
parent14e8a79c95385215d752f3e3de8c0fb7d4b54adc (diff)
downloadframeworks_base-9302a733b01c3ab4abd7911a286baf4833847d56.zip
frameworks_base-9302a733b01c3ab4abd7911a286baf4833847d56.tar.gz
frameworks_base-9302a733b01c3ab4abd7911a286baf4833847d56.tar.bz2
Fix broken build
Change-Id: Icff98663842482149d8c5c5371327121a1adff3d
-rw-r--r--api/current.txt5
-rw-r--r--core/java/android/hardware/hdmi/HdmiControlManager.java6
2 files changed, 5 insertions, 6 deletions
diff --git a/api/current.txt b/api/current.txt
index 2a69c16..5fe29ad 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -12869,7 +12869,7 @@ package android.hardware.hdmi {
method public void addHotplugEventListener(android.hardware.hdmi.HdmiControlManager.HotplugEventListener);
method public android.hardware.hdmi.HdmiPlaybackClient getPlaybackClient();
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 {
@@ -12877,7 +12877,6 @@ package android.hardware.hdmi {
}
public final class HdmiHotplugEvent implements android.os.Parcelable {
- ctor public HdmiHotplugEvent(int, boolean);
method public int describeContents();
method public int getPort();
method public boolean isConnected();
@@ -15763,7 +15762,7 @@ package android.media.session {
method public void setActive(boolean);
method public void setFlags(int);
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);
field public static final int FLAG_HANDLES_MEDIA_BUTTONS = 1; // 0x1
field public static final int FLAG_HANDLES_TRANSPORT_CONTROLS = 2; // 0x2
diff --git a/core/java/android/hardware/hdmi/HdmiControlManager.java b/core/java/android/hardware/hdmi/HdmiControlManager.java
index f3de547..5b6e862 100644
--- a/core/java/android/hardware/hdmi/HdmiControlManager.java
+++ b/core/java/android/hardware/hdmi/HdmiControlManager.java
@@ -114,10 +114,10 @@ public final class HdmiControlManager {
* Adds a listener to get informed of {@link HdmiHotplugEvent}.
*
* <p>To stop getting the notification,
- * use {@link #removeHotplugeEventListener(HotplugEventListener)}.
+ * use {@link #removeHotplugEventListener(HotplugEventListener)}.
*
* @param listener {@link HotplugEventListener} instance
- * @see HdmiControlManager#removeHotplugeEventListener(HotplugEventListener)
+ * @see HdmiControlManager#removeHotplugEventListener(HotplugEventListener)
*/
public void addHotplugEventListener(HotplugEventListener listener) {
if (mService == null) {
@@ -135,7 +135,7 @@ public final class HdmiControlManager {
*
* @param listener {@link HotplugEventListener} instance to be removed
*/
- public void removeHotplugeEventListener(HotplugEventListener listener) {
+ public void removeHotplugEventListener(HotplugEventListener listener) {
if (mService == null) {
return;
}