commit 45bd8303fe20f20843f5a76ddf42a5ace54add58
author John Huang <jsh@google.com> Mon Oct 18 13:41:04 2010 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Mon Oct 18 13:41:04 2010 -0700
tree 057edc4b50707037518afff86d16fe87f3456527
parent 382717f3eeca1a21e9756c7de42b4d31747d1675
parent a0cdfbf5b74a92611789b7ec08a84274b9011021

Merge "Uncomment SIP/VOIP feature check in SipManager." into gingerbread

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

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 @@
      * 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);
-         */
     }
 
     /**