diff options
| author | Hung-ying Tyan <tyanh@google.com> | 2010-09-28 17:37:04 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-28 17:37:04 -0700 |
| commit | 0b3968ae539f084a7b29afffcd9dc3f02e81c811 (patch) | |
| tree | fec271cf348a3b7ccf72de526e1daa0dd4fceb1e | |
| parent | 76112e0a9dd0c1b67d26a418d79869ac7cec4c32 (diff) | |
| parent | 0d44776016cecf1c7c826c4784f8f867a56235f0 (diff) | |
| download | frameworks_base-0b3968ae539f084a7b29afffcd9dc3f02e81c811.zip frameworks_base-0b3968ae539f084a7b29afffcd9dc3f02e81c811.tar.gz frameworks_base-0b3968ae539f084a7b29afffcd9dc3f02e81c811.tar.bz2 | |
am 0d447760: am 6d028dd2: Merge "SIP: Feedback any provisional responses in addition to RING" into gingerbread
Merge commit '0d44776016cecf1c7c826c4784f8f867a56235f0'
* commit '0d44776016cecf1c7c826c4784f8f867a56235f0':
SIP: Feedback any provisional responses in addition to RING
| -rw-r--r-- | voip/java/com/android/server/sip/SipSessionGroup.java | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/voip/java/com/android/server/sip/SipSessionGroup.java b/voip/java/com/android/server/sip/SipSessionGroup.java index 8f9a26b..4321d7b 100644 --- a/voip/java/com/android/server/sip/SipSessionGroup.java +++ b/voip/java/com/android/server/sip/SipSessionGroup.java @@ -28,7 +28,6 @@ import android.net.sip.ISipSessionListener; import android.net.sip.SipErrorCode; import android.net.sip.SipProfile; import android.net.sip.SipSession; -import android.net.sip.SipSessionAdapter; import android.text.TextUtils; import android.util.Log; @@ -959,6 +958,11 @@ class SipSessionGroup implements SipListener { int statusCode = response.getStatusCode(); switch (statusCode) { case Response.RINGING: + case Response.CALL_IS_BEING_FORWARDED: + case Response.QUEUED: + case Response.SESSION_PROGRESS: + // feedback any provisional responses (except TRYING) as + // ring back for better UX if (mState == SipSession.State.OUTGOING_CALL) { mState = SipSession.State.OUTGOING_CALL_RING_BACK; mProxy.onRingingBack(this); |