diff options
| author | Xavier Ducrohet <xav@android.com> | 2010-05-12 07:50:19 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-05-12 07:50:19 -0700 |
| commit | d9712b69ce529fbf50b3b837032c1dc40e623381 (patch) | |
| tree | 09f90db7ddaa8849cadc66d02ef70de1a94cc7a0 /media/java | |
| parent | bbafdc6403488b0f7ad564a5a0ff2eed5b87ab7b (diff) | |
| parent | b1235a57a09174179553acecef2370354bdcbf41 (diff) | |
| download | frameworks_base-d9712b69ce529fbf50b3b837032c1dc40e623381.zip frameworks_base-d9712b69ce529fbf50b3b837032c1dc40e623381.tar.gz frameworks_base-d9712b69ce529fbf50b3b837032c1dc40e623381.tar.bz2 | |
am b1235a57: Merge "Hide two audio focus methods." into froyo
Merge commit 'b1235a57a09174179553acecef2370354bdcbf41' into froyo-plus-aosp
* commit 'b1235a57a09174179553acecef2370354bdcbf41':
Hide two audio focus methods.
Diffstat (limited to 'media/java')
| -rw-r--r-- | media/java/android/media/AudioManager.java | 2 |
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. */ |