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

Commit 6b70f569 authored by Chia-chi Yeh's avatar Chia-chi Yeh Committed by Android Git Automerger
Browse files

am 0588f16b: am ab7c3245: Merge "NEW_API: Unhide RTP APIs." into honeycomb-mr1 

* commit '0588f16b':
  NEW_API: Unhide RTP APIs.
parents 81f4fdc1 0588f16b

api/current.xml

+491 −0
Original line number Diff line number Diff line
@@ -118140,6 +118140,497 @@ 
</field>

</class>

</package>

<package name="android.net.rtp"

>

<class name="AudioCodec"

 extends="java.lang.Object"

 abstract="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<method name="getCodec"

 return="android.net.rtp.AudioCodec"

 abstract="false"

 native="false"

 synchronized="false"

 static="true"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="type" type="int">

</parameter>

<parameter name="rtpmap" type="java.lang.String">

</parameter>

<parameter name="fmtp" type="java.lang.String">

</parameter>

</method>

<method name="getCodecs"

 return="android.net.rtp.AudioCodec[]"

 abstract="false"

 native="false"

 synchronized="false"

 static="true"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

</method>

<field name="AMR"

 type="android.net.rtp.AudioCodec"

 transient="false"

 volatile="false"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="GSM"

 type="android.net.rtp.AudioCodec"

 transient="false"

 volatile="false"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="GSM_EFR"

 type="android.net.rtp.AudioCodec"

 transient="false"

 volatile="false"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="PCMA"

 type="android.net.rtp.AudioCodec"

 transient="false"

 volatile="false"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="PCMU"

 type="android.net.rtp.AudioCodec"

 transient="false"

 volatile="false"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="fmtp"

 type="java.lang.String"

 transient="false"

 volatile="false"

 static="false"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="rtpmap"

 type="java.lang.String"

 transient="false"

 volatile="false"

 static="false"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="type"

 type="int"

 transient="false"

 volatile="false"

 static="false"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

</class>

<class name="AudioGroup"

 extends="java.lang.Object"

 abstract="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<constructor name="AudioGroup"

 type="android.net.rtp.AudioGroup"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

</constructor>

<method name="clear"

 return="void"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

</method>

<method name="getMode"

 return="int"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

</method>

<method name="getStreams"

 return="android.net.rtp.AudioStream[]"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

</method>

<method name="sendDtmf"

 return="void"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="event" type="int">

</parameter>

</method>

<method name="setMode"

 return="void"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="mode" type="int">

</parameter>

</method>

<field name="MODE_ECHO_SUPPRESSION"

 type="int"

 transient="false"

 volatile="false"

 value="3"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="MODE_MUTED"

 type="int"

 transient="false"

 volatile="false"

 value="1"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="MODE_NORMAL"

 type="int"

 transient="false"

 volatile="false"

 value="2"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="MODE_ON_HOLD"

 type="int"

 transient="false"

 volatile="false"

 value="0"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

</class>

<class name="AudioStream"

 extends="android.net.rtp.RtpStream"

 abstract="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<constructor name="AudioStream"

 type="android.net.rtp.AudioStream"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="address" type="java.net.InetAddress">

</parameter>

<exception name="SocketException" type="java.net.SocketException">

</exception>

</constructor>

<method name="getCodec"

 return="android.net.rtp.AudioCodec"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

</method>

<method name="getDtmfType"

 return="int"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

</method>

<method name="getGroup"

 return="android.net.rtp.AudioGroup"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

</method>

<method name="isBusy"

 return="boolean"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</method>

<method name="join"

 return="void"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="group" type="android.net.rtp.AudioGroup">

</parameter>

</method>

<method name="setCodec"

 return="void"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="codec" type="android.net.rtp.AudioCodec">

</parameter>

</method>

<method name="setDtmfType"

 return="void"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="type" type="int">

</parameter>

</method>

</class>

<class name="RtpStream"

 extends="java.lang.Object"

 abstract="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<method name="associate"

 return="void"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="address" type="java.net.InetAddress">

</parameter>

<parameter name="port" type="int">

</parameter>

</method>

<method name="getLocalAddress"

 return="java.net.InetAddress"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

</method>

<method name="getLocalPort"

 return="int"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

</method>

<method name="getMode"

 return="int"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

</method>

<method name="getRemoteAddress"

 return="java.net.InetAddress"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

</method>

<method name="getRemotePort"

 return="int"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

</method>

<method name="isBusy"

 return="boolean"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

</method>

<method name="release"

 return="void"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

</method>

<method name="setMode"

 return="void"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="mode" type="int">

</parameter>

</method>

<field name="MODE_NORMAL"

 type="int"

 transient="false"

 volatile="false"

 value="0"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="MODE_RECEIVE_ONLY"

 type="int"

 transient="false"

 volatile="false"

 value="2"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="MODE_SEND_ONLY"

 type="int"

 transient="false"

 volatile="false"

 value="1"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

</class>

</package>

<package name="android.net.sip"

>

<class name="SipAudioCall"

voip/java/android/net/rtp/AudioCodec.java

+0 −1
Original line number Diff line number Diff line
@@ -33,7 +33,6 @@ import java.util.Arrays; 
 * </pre>

 *

 * @see AudioStream

 * @hide

 */

public class AudioCodec {

    /**

voip/java/android/net/rtp/AudioGroup.java

+0 −1
Original line number Diff line number Diff line
@@ -59,7 +59,6 @@ import java.util.Map; 
 * the AudioGroups is in use.</p>

 *

 * @see AudioStream

 * @hide

 */

public class AudioGroup {

    /**

voip/java/android/net/rtp/AudioStream.java

+0 −1
Original line number Diff line number Diff line
@@ -41,7 +41,6 @@ import java.net.SocketException; 
 *

 * @see RtpStream

 * @see AudioGroup

 * @hide

 */

public class AudioStream extends RtpStream {

    private AudioCodec mCodec;

voip/java/android/net/rtp/RtpStream.java

+0 −1
Original line number Diff line number Diff line
@@ -27,7 +27,6 @@ import java.net.SocketException; 
 *

 * <p class="note">Using this class requires

 * {@link android.Manifest.permission#INTERNET} permission.</p>

 * @hide

 */

public class RtpStream {

    /**