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

Merge commit 'd9712b69ce529fbf50b3b837032c1dc40e623381' into kraken

* commit 'd9712b69ce529fbf50b3b837032c1dc40e623381':
  Hide two audio focus methods.

3 files changed, 2 insertions, 52 deletions

diff --git a/api/8.xml b/api/8.xml
index e757db2c5bb2..9d259f3a3090 100644
--- a/api/8.xml
+++ b/api/8.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/api/current.xml b/api/current.xml
index dcecd28a85f7..97fb7c9de94e 100644
--- a/api/current.xml
+++ b/api/current.xml
@@ -84108,19 +84108,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"
@@ -84380,19 +84367,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 5813a4278f25..bbbba7472271 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.
      */