From 8aa798b244e32e227bad97d40ddfd7d3557030a3 Mon Sep 17 00:00:00 2001
From: Jean-Michel Trivi <jmtrivi@google.com>
Date: Thu, 18 Nov 2010 09:26:55 -0800
Subject: Unhide android.media.AudioManager.MODE_IN_COMMUNICATION

Unhide new constant for an audio mode for a system state when
 the device has a VoIP (as opposed to telephony) call established.
Update the setMode and getMode javadoc to link to the mode constants
 that can be set or retrieved.

Change-Id: I90c4417679f215eb66e5305086fd077beddaa59c
---
 api/current.xml                            | 13 ++++++++++++-
 media/java/android/media/AudioManager.java |  7 ++++---
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/api/current.xml b/api/current.xml
index 059f4d4fd4c7..42cdaf23e54d 100644
--- a/api/current.xml
+++ b/api/current.xml
@@ -98978,6 +98978,17 @@
  visibility="public"
 >
 </field>
+<field name="MODE_IN_COMMUNICATION"
+ type="int"
+ transient="false"
+ volatile="false"
+ value="3"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
 <field name="MODE_NORMAL"
  type="int"
  transient="false"
@@ -248462,7 +248473,7 @@
  deprecated="not deprecated"
  visibility="public"
 >
-<parameter name="arg0" type="T">
+<parameter name="t" type="T">
 </parameter>
 </method>
 </interface>
diff --git a/media/java/android/media/AudioManager.java b/media/java/android/media/AudioManager.java
index def88aede588..9058a7ba8e55 100644
--- a/media/java/android/media/AudioManager.java
+++ b/media/java/android/media/AudioManager.java
@@ -984,7 +984,8 @@ public class AudioManager {
      * application when it places a phone call, as it will cause signals from the radio layer
      * to feed the platform mixer.
      *
-     * @param mode  the requested audio mode (NORMAL, RINGTONE, IN_CALL or IN_COMMUNICATION).
+     * @param mode  the requested audio mode ({@link #MODE_NORMAL}, {@link #MODE_RINGTONE},
+     *              {@link #MODE_IN_CALL} or {@link #MODE_IN_COMMUNICATION}).
      *              Informs the HAL about the current audio state so that
      *              it can route the audio appropriately.
      */
@@ -1000,7 +1001,8 @@ public class AudioManager {
     /**
      * Returns the current audio mode.
      *
-     * @return      the current audio mode (NORMAL, RINGTONE, IN_CALL or IN_COMMUNICATION).
+     * @return      the current audio mode ({@link #MODE_NORMAL}, {@link #MODE_RINGTONE},
+     *              {@link #MODE_IN_CALL} or {@link #MODE_IN_COMMUNICATION}).
      *              Returns the current current audio state from the HAL.
      */
     public int getMode() {
@@ -1038,7 +1040,6 @@ public class AudioManager {
      */
     public static final int MODE_IN_CALL            = AudioSystem.MODE_IN_CALL;
     /**
-     * @hide
      * In communication audio mode. An audio/video chat or VoIP call is established.
      */
     public static final int MODE_IN_COMMUNICATION   = AudioSystem.MODE_IN_COMMUNICATION;
-- 
cgit v1.2.3-59-g8ed1b