summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
authorXavier Ducrohet <xav@android.com>2010-05-11 14:48:48 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2010-05-11 14:48:48 -0700
commitb1235a57a09174179553acecef2370354bdcbf41 (patch)
tree68e30545bc8e2199ff43c96028c3cf00b0cf25d5 /media
parent836b2d75ef86487ecae0ae834ecbab324fd99471 (diff)
parent5f53f0883a507b9d4b9b9891af560a64f746d149 (diff)
downloadframeworks_base-b1235a57a09174179553acecef2370354bdcbf41.zip
frameworks_base-b1235a57a09174179553acecef2370354bdcbf41.tar.gz
frameworks_base-b1235a57a09174179553acecef2370354bdcbf41.tar.bz2
Merge "Hide two audio focus methods." into froyo
Diffstat (limited to 'media')
-rw-r--r--media/java/android/media/AudioManager.java2
1 files changed, 2 insertions, 0 deletions
diff --git a/media/java/android/media/AudioManager.java b/media/java/android/media/AudioManager.java
index 5813a42..bbbba74 100644
--- a/media/java/android/media/AudioManager.java
+++ b/media/java/android/media/AudioManager.java
@@ -1382,6 +1382,7 @@ public class AudioManager {
}
/**
+ * @hide
* Registers a listener to be called when audio focus changes. Calling this method is optional
* before calling {@link #requestAudioFocus(OnAudioFocusChangeListener, int, int)}, as it
* will register the listener as well if it wasn't registered already.
@@ -1397,6 +1398,7 @@ public class AudioManager {
}
/**
+ * @hide
* Causes the specified listener to not be called anymore when focus is gained or lost.
* @param l the listener to unregister.
*/