drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Merge commit '4056ab97be6224dcc00ac70843544790f2d65fb7' into gingerbread-plus-aosp

* commit '4056ab97be6224dcc00ac70843544790f2d65fb7':
  Add permission requirements to SipAudioCall and SipManager javadoc.
This commit is contained in:
Hung-ying Tyan
2010-10-20 14:03:54 -07:00
committed by Android Git Automerger
parent 940b4d1c45 4056ab97be
commit bdc15d8b43
2 changed files with 22 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
voip/java/android/net/sip/SipAudioCall.java
View File

@ -41,6 +41,16 @@ import java.util.Map;
* facilitates instantiating a {@code SipAudioCall} object for making/receiving * facilitates instantiating a {@code SipAudioCall} object for making/receiving
* calls. See {@link SipManager#makeAudioCall} and * calls. See {@link SipManager#makeAudioCall} and
* {@link SipManager#takeAudioCall}. * {@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 { public class SipAudioCall {
private static final String TAG = SipAudioCall.class.getSimpleName(); 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) { public void setSpeakerMode(boolean speakerMode) {
synchronized (this) { synchronized (this) {
((AudioManager) mContext.getSystemService(Context.AUDIO_SERVICE)) ((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 * Starts the audio for the established call. This method should be called
* after {@link Listener#onCallEstablished} is 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() { public void startAudio() {
try { try {

3
voip/java/android/net/sip/SipManager.java
View File

@ -50,6 +50,9 @@ import java.text.ParseException;
* </ul> * </ul>
* {@code SipManager} can only be instantiated if SIP API is supported by the * {@code SipManager} can only be instantiated if SIP API is supported by the
* device. (See {@link #isApiSupported}). * 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 { public class SipManager {
/** /**