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

Commit bdc15d8b authored by Hung-ying Tyan's avatar Hung-ying Tyan Committed by Android Git Automerger
Browse files

am 4056ab97: Merge "Add permission requirements to SipAudioCall and SipManager... 

am 4056ab97: Merge "Add permission requirements to SipAudioCall and SipManager javadoc." into gingerbread

Merge commit '4056ab97' into gingerbread-plus-aosp

* commit '4056ab97':
  Add permission requirements to SipAudioCall and SipManager javadoc.
parents 940b4d1c 4056ab97

voip/java/android/net/sip/SipAudioCall.java

+19 −1
Original line number Diff line number Diff line
@@ -41,6 +41,16 @@ import java.util.Map; 
 * facilitates instantiating a {@code SipAudioCall} object for making/receiving

 * calls. See {@link SipManager#makeAudioCall} and

 * {@link SipManager#takeAudioCall}.

 *

 * <p>Requires permissions to use this class:

 *   {@link android.Manifest.permission#INTERNET} and

 *   {@link android.Manifest.permission#USE_SIP}.

 * <br/>Requires permissions to {@link #startAudio}:

 *   {@link android.Manifest.permission#RECORD_AUDIO},

 *   {@link android.Manifest.permission#ACCESS_WIFI_STATE} and

 *   {@link android.Manifest.permission#WAKE_LOCK}.

 * <br/>Requires permissions to {@link #setSpeakerMode}:

 *   {@link android.Manifest.permission#MODIFY_AUDIO_SETTINGS}.

 */

public class SipAudioCall {

    private static final String TAG = SipAudioCall.class.getSimpleName();
@@ -774,7 +784,11 @@ public class SipAudioCall { 
        }

    }



    /** Puts the device to speaker mode. */

    /**

     * Puts the device to speaker mode.

     * <p>Requires permission:

     *   {@link android.Manifest.permission#MODIFY_AUDIO_SETTINGS}.

     */

    public void setSpeakerMode(boolean speakerMode) {

        synchronized (this) {

            ((AudioManager) mContext.getSystemService(Context.AUDIO_SERVICE))
@@ -874,6 +888,10 @@ public class SipAudioCall { 
    /**

     * Starts the audio for the established call. This method should be called

     * after {@link Listener#onCallEstablished} is called.

     * <p>Requires permission:

     *   {@link android.Manifest.permission#RECORD_AUDIO},

     *   {@link android.Manifest.permission#ACCESS_WIFI_STATE} and

     *   {@link android.Manifest.permission#WAKE_LOCK}.

     */

    public void startAudio() {

        try {

voip/java/android/net/sip/SipManager.java

+3 −0
Original line number Diff line number Diff line
@@ -50,6 +50,9 @@ import java.text.ParseException; 
 * </ul>

 * {@code SipManager} can only be instantiated if SIP API is supported by the

 * device. (See {@link #isApiSupported}).

 * <p>Requires permissions to use this class:

 *   {@link android.Manifest.permission#INTERNET} and

 *   {@link android.Manifest.permission#USE_SIP}.

 */

public class SipManager {

    /**