summaryrefslogtreecommitdiffstats
path: root/voip/java/android/net/sip
diff options
context:
space:
mode:
authorHung-ying Tyan <tyanh@google.com>2010-10-08 18:28:20 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-10-08 18:28:20 -0700
commitc7e4b2d5bb9c9ab2d4a8efa0fd07be9d83987d36 (patch)
treebf49d4e12a6f0dd8a41477161189b7883f189b5b /voip/java/android/net/sip
parentd856b1ce92b0d14b4e5b87d02f746e0d6ae7dc87 (diff)
parent841d6ff9e05daccbc60daa1618a27e9db3a4fb32 (diff)
downloadframeworks_base-c7e4b2d5bb9c9ab2d4a8efa0fd07be9d83987d36.zip
frameworks_base-c7e4b2d5bb9c9ab2d4a8efa0fd07be9d83987d36.tar.gz
frameworks_base-c7e4b2d5bb9c9ab2d4a8efa0fd07be9d83987d36.tar.bz2
am 841d6ff9: am 62ec9834: Merge "Make SipService broadcast SIP_SERVICE_UP when it\'s up." into gingerbread
Merge commit '841d6ff9e05daccbc60daa1618a27e9db3a4fb32' * commit '841d6ff9e05daccbc60daa1618a27e9db3a4fb32': Make SipService broadcast SIP_SERVICE_UP when it's up.
Diffstat (limited to 'voip/java/android/net/sip')
-rw-r--r--voip/java/android/net/sip/SipManager.java7
1 files changed, 7 insertions, 0 deletions
diff --git a/voip/java/android/net/sip/SipManager.java b/voip/java/android/net/sip/SipManager.java
index 80c35fb..8c32aa0 100644
--- a/voip/java/android/net/sip/SipManager.java
+++ b/voip/java/android/net/sip/SipManager.java
@@ -65,6 +65,13 @@ public class SipManager {
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.
* @hide