diff options
| author | John Huang <jsh@google.com> | 2010-10-19 09:54:16 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-10-19 09:54:16 -0700 |
| commit | 78c206c75095b4a9092aabed8e79702ae0c5dc86 (patch) | |
| tree | b18619d2fbcdb4a8d01f1f37ee5bfa7f6f53e68c /voip | |
| parent | 723e997ef9745ad05c2499509c21976a42f2f278 (diff) | |
| parent | 085996c411b4d3878dfd97c59bfc4a17da08959b (diff) | |
| download | frameworks_base-78c206c75095b4a9092aabed8e79702ae0c5dc86.zip frameworks_base-78c206c75095b4a9092aabed8e79702ae0c5dc86.tar.gz frameworks_base-78c206c75095b4a9092aabed8e79702ae0c5dc86.tar.bz2 | |
am 085996c4: am 45bd8303: Merge "Uncomment SIP/VOIP feature check in SipManager." into gingerbread
Merge commit '085996c411b4d3878dfd97c59bfc4a17da08959b'
* commit '085996c411b4d3878dfd97c59bfc4a17da08959b':
Uncomment SIP/VOIP feature check in SipManager.
Diffstat (limited to 'voip')
| -rw-r--r-- | voip/java/android/net/sip/SipManager.java | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/voip/java/android/net/sip/SipManager.java b/voip/java/android/net/sip/SipManager.java index ee0e3cd..2f03e34 100644 --- a/voip/java/android/net/sip/SipManager.java +++ b/voip/java/android/net/sip/SipManager.java @@ -126,22 +126,16 @@ public class SipManager { * Returns true if the SIP API is supported by the system. */ public static boolean isApiSupported(Context context) { - return true; - /* TODO: uncomment this before ship return context.getPackageManager().hasSystemFeature( PackageManager.FEATURE_SIP); - */ } /** * Returns true if the system supports SIP-based VoIP. */ public static boolean isVoipSupported(Context context) { - return true; - /* TODO: uncomment this before ship return context.getPackageManager().hasSystemFeature( PackageManager.FEATURE_SIP_VOIP) && isApiSupported(context); - */ } /** |