Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 085996c4 authored by John Huang's avatar John Huang Committed by Android Git Automerger
Browse files

am 45bd8303: Merge "Uncomment SIP/VOIP feature check in SipManager." into gingerbread 

Merge commit '45bd8303' into gingerbread-plus-aosp

* commit '45bd8303':
  Uncomment SIP/VOIP feature check in SipManager.
parents 3e9bcb98 45bd8303

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);

         */

    }



    /**