am b355714a: Merge "SipManager: always return true for SIP API and VOIP support query." into gingerbread

Merge commit 'b355714a2995ebe343808e06f69da5067f52a833' into gingerbread-plus-aosp

* commit 'b355714a2995ebe343808e06f69da5067f52a833':
  SipManager: always return true for SIP API and VOIP support query.

1 files changed, 6 insertions, 0 deletions

diff --git a/voip/java/android/net/sip/SipManager.java b/voip/java/android/net/sip/SipManager.java
index 700fb4ea85bb..beec8fe0c184 100644
--- a/voip/java/android/net/sip/SipManager.java
+++ b/voip/java/android/net/sip/SipManager.java
@@ -83,16 +83,22 @@ public class SipManager {
      * Returns true if the SIP API is supported by the system.
      */
     public static boolean isApiSupported(Context context) {
+        return true;
+        /* 
         return context.getPackageManager().hasSystemFeature(
                 PackageManager.FEATURE_SIP);
+         */
     }
 
     /**
      * Returns true if the system supports SIP-based VoIP.
      */
     public static boolean isVoipSupported(Context context) {
+        return true;
+        /* 
         return context.getPackageManager().hasSystemFeature(
                 PackageManager.FEATURE_SIP_VOIP) && isApiSupported(context);
+         */
     }
 
     private SipManager() {