Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d9712b69 authored by Xavier Ducrohet's avatar Xavier Ducrohet Committed by Android Git Automerger
Browse files

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

Merge commit 'b1235a57' into froyo-plus-aosp

* commit 'b1235a57':
  Hide two audio focus methods.
parents bbafdc64 b1235a57

api/8.xml

+0 −26
Original line number Diff line number Diff line
@@ -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"

api/current.xml

+0 −26
Original line number Diff line number Diff line
@@ -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"

media/java/android/media/AudioManager.java

+2 −0
Original line number Diff line number Diff line
@@ -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.

     */