am ea16e72b: am b355714a: Merge "SipManager: always return true for SIP API and VOIP support query." into gingerbread
Merge commit 'ea16e72bff350c0b6e2a00a82b934d1a2fc0fa2d'
* commit 'ea16e72bff350c0b6e2a00a82b934d1a2fc0fa2d':
SipManager: always return true for SIP API and VOIP support query.
diff --git a/voip/java/android/net/sip/SipManager.java b/voip/java/android/net/sip/SipManager.java
index 700fb4e..beec8fe 100644
--- a/voip/java/android/net/sip/SipManager.java
+++ b/voip/java/android/net/sip/SipManager.java
@@ -83,16 +83,22 @@
* 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() {