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

Commit 841d6ff9 authored by Hung-ying Tyan's avatar Hung-ying Tyan Committed by Android Git Automerger
Browse files

am 62ec9834: Merge "Make SipService broadcast SIP_SERVICE_UP when it\'s up." into gingerbread 

Merge commit '62ec9834' into gingerbread-plus-aosp

* commit '62ec9834':
  Make SipService broadcast SIP_SERVICE_UP when it's up.
parents 86b50028 62ec9834

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

+7 −0
Original line number Diff line number Diff line
@@ -64,6 +64,13 @@ public class SipManager { 
    /** Part of the incoming call intent. */

    public static final String EXTRA_OFFER_SD = "android:sipOfferSD";



    /**

     * Action to broadcast when SipService is up.

     * Internal use only.

     * @hide

     */

    public static final String ACTION_SIP_SERVICE_UP =

            "android.net.sip.SIP_SERVICE_UP";

    /**

     * Action string for the incoming call intent for the Phone app.

     * Internal use only.

voip/java/com/android/server/sip/SipService.java

+1 −0
Original line number Diff line number Diff line
@@ -100,6 +100,7 @@ public final class SipService extends ISipService.Stub { 
    public static void start(Context context) {

        if (SipManager.isApiSupported(context)) {

            ServiceManager.addService("sip", new SipService(context));

            context.sendBroadcast(new Intent(SipManager.ACTION_SIP_SERVICE_UP));

            Log.i(TAG, "SIP service started");

        }

    }