drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am b1235a57: Merge "Hide two audio focus methods." into froyo

Browse Source 
Merge commit 'b1235a57a09174179553acecef2370354bdcbf41' into froyo-plus-aosp

* commit 'b1235a57a09174179553acecef2370354bdcbf41':
  Hide two audio focus methods.
This commit is contained in:
Xavier Ducrohet
2010-05-12 07:50:19 -07:00
committed by Android Git Automerger
parent bbafdc6403 b1235a57a0
commit d9712b69ce
3 changed files with 2 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
api/8.xml
View File

@ -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"

26
api/current.xml
View File

@ -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"

2
media/java/android/media/AudioManager.java
View File

@ -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.
*/