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 | |
| 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.
| -rw-r--r-- | api/8.xml | 26 | ||||
| -rw-r--r-- | api/current.xml | 26 | ||||
| -rw-r--r-- | media/java/android/media/AudioManager.java | 2 |
3 files changed, 2 insertions, 52 deletions
@@ -80490,19 +80490,6 @@ <parameter name="volume" type="float"> </parameter> </method> -<method name="registerAudioFocusListener" - return="void" - abstract="false" - native="false" - synchronized="false" - static="false" - final="false" - deprecated="not deprecated" - visibility="public" -> -<parameter name="l" type="android.media.AudioManager.OnAudioFocusChangeListener"> -</parameter> -</method> <method name="registerMediaButtonEventReceiver" return="void" abstract="false" @@ -80762,19 +80749,6 @@ visibility="public" > </method> -<method name="unregisterAudioFocusListener" - return="void" - abstract="false" - native="false" - synchronized="false" - static="false" - final="false" - deprecated="not deprecated" - visibility="public" -> -<parameter name="l" type="android.media.AudioManager.OnAudioFocusChangeListener"> -</parameter> -</method> <method name="unregisterMediaButtonEventReceiver" return="void" abstract="false" diff --git a/api/current.xml b/api/current.xml index a0042d1..4ec3355 100644 --- a/api/current.xml +++ b/api/current.xml @@ -80490,19 +80490,6 @@ <parameter name="volume" type="float"> </parameter> </method> -<method name="registerAudioFocusListener" - return="void" - abstract="false" - native="false" - synchronized="false" - static="false" - final="false" - deprecated="not deprecated" - visibility="public" -> -<parameter name="l" type="android.media.AudioManager.OnAudioFocusChangeListener"> -</parameter> -</method> <method name="registerMediaButtonEventReceiver" return="void" abstract="false" @@ -80762,19 +80749,6 @@ visibility="public" > </method> -<method name="unregisterAudioFocusListener" - return="void" - abstract="false" - native="false" - synchronized="false" - static="false" - final="false" - deprecated="not deprecated" - visibility="public" -> -<parameter name="l" type="android.media.AudioManager.OnAudioFocusChangeListener"> -</parameter> -</method> <method name="unregisterMediaButtonEventReceiver" return="void" abstract="false" 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. */ |