diff options
| author | Hung-ying Tyan <tyanh@google.com> | 2010-10-21 13:44:06 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-10-21 13:44:06 -0700 |
| commit | 6d848f759e901264935ed7ba1094d865e3b2c16b (patch) | |
| tree | d1fe2d4d275153f75ab4c979305e63f5f8b6594a /voip/java | |
| parent | 2cef210f53ac9ca5471e87fa02db252442448b7d (diff) | |
| parent | bdc15d8b43e7763bf72780d0f683b223b8cf6625 (diff) | |
| download | frameworks_base-6d848f759e901264935ed7ba1094d865e3b2c16b.zip frameworks_base-6d848f759e901264935ed7ba1094d865e3b2c16b.tar.gz frameworks_base-6d848f759e901264935ed7ba1094d865e3b2c16b.tar.bz2 | |
am bdc15d8b: am 4056ab97: Merge "Add permission requirements to SipAudioCall and SipManager javadoc." into gingerbread
Merge commit 'bdc15d8b43e7763bf72780d0f683b223b8cf6625'
* commit 'bdc15d8b43e7763bf72780d0f683b223b8cf6625':
Add permission requirements to SipAudioCall and SipManager javadoc.
Diffstat (limited to 'voip/java')
| -rw-r--r-- | voip/java/android/net/sip/SipAudioCall.java | 20 | ||||
| -rw-r--r-- | voip/java/android/net/sip/SipManager.java | 3 |
2 files changed, 22 insertions, 1 deletions
diff --git a/voip/java/android/net/sip/SipAudioCall.java b/voip/java/android/net/sip/SipAudioCall.java index fbd3db8..0179748 100644 --- a/voip/java/android/net/sip/SipAudioCall.java +++ b/voip/java/android/net/sip/SipAudioCall.java @@ -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(); @@ -776,7 +786,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)) @@ -876,6 +890,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 { diff --git a/voip/java/android/net/sip/SipManager.java b/voip/java/android/net/sip/SipManager.java index e1b1d10..38d2b0c 100644 --- a/voip/java/android/net/sip/SipManager.java +++ b/voip/java/android/net/sip/SipManager.java @@ -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 { /** |