Merge "Uncomment SIP/VOIP feature check in SipManager." into gingerbread (45bd8303) · Commits · e / os / android_frameworks_base

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

+0 −6

Original line number	Diff line number	Diff line
		@@ -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);
		*/
		}

		/**