diff options
| author | Hung-ying Tyan <tyanh@google.com> | 2010-10-07 07:18:27 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-10-07 07:18:27 -0700 |
| commit | 841d6ff9e05daccbc60daa1618a27e9db3a4fb32 (patch) | |
| tree | cd1f0f950ae7fae484487809fd07537c64b3f920 /voip/java | |
| parent | 86b500289bffd8ce51e57e17d42741a202dd9ffd (diff) | |
| parent | 62ec9834a09c9037d195c306fd838b4c0425e7e2 (diff) | |
| download | frameworks_base-841d6ff9e05daccbc60daa1618a27e9db3a4fb32.zip frameworks_base-841d6ff9e05daccbc60daa1618a27e9db3a4fb32.tar.gz frameworks_base-841d6ff9e05daccbc60daa1618a27e9db3a4fb32.tar.bz2 | |
am 62ec9834: Merge "Make SipService broadcast SIP_SERVICE_UP when it\'s up." into gingerbread
Merge commit '62ec9834a09c9037d195c306fd838b4c0425e7e2' into gingerbread-plus-aosp
* commit '62ec9834a09c9037d195c306fd838b4c0425e7e2':
Make SipService broadcast SIP_SERVICE_UP when it's up.
Diffstat (limited to 'voip/java')
| -rw-r--r-- | voip/java/android/net/sip/SipManager.java | 7 | ||||
| -rw-r--r-- | voip/java/com/android/server/sip/SipService.java | 1 |
2 files changed, 8 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 diff --git a/voip/java/com/android/server/sip/SipService.java b/voip/java/com/android/server/sip/SipService.java index d8a1572..1fa2400 100644 --- a/voip/java/com/android/server/sip/SipService.java +++ b/voip/java/com/android/server/sip/SipService.java @@ -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"); } } |