diff options
| author | Hung-ying Tyan <tyanh@google.com> | 2011-07-03 19:53:35 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-07-03 19:53:35 -0700 |
| commit | f8c34ad3efd82974f166419b174431564658a7d0 (patch) | |
| tree | f5521c82dd0ed69fee101686e94cd7fddb8b5144 /voip | |
| parent | c2b8aa0b4c822b0e307f62131650f4a6ee89bb66 (diff) | |
| parent | 8ba4566c01c5848b378d1d86e9041730f5b5a13f (diff) | |
| download | frameworks_base-f8c34ad3efd82974f166419b174431564658a7d0.zip frameworks_base-f8c34ad3efd82974f166419b174431564658a7d0.tar.gz frameworks_base-f8c34ad3efd82974f166419b174431564658a7d0.tar.bz2 | |
Merge "Do not keep alive for re-established call."
Diffstat (limited to 'voip')
| -rw-r--r-- | voip/java/com/android/server/sip/SipSessionGroup.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/voip/java/com/android/server/sip/SipSessionGroup.java b/voip/java/com/android/server/sip/SipSessionGroup.java index 047eb8d..4e44402 100644 --- a/voip/java/com/android/server/sip/SipSessionGroup.java +++ b/voip/java/com/android/server/sip/SipSessionGroup.java @@ -1223,9 +1223,9 @@ class SipSessionGroup implements SipListener { private void establishCall(boolean enableKeepAlive) { mState = SipSession.State.IN_CALL; - mInCall = true; cancelSessionTimer(); - if (enableKeepAlive) enableKeepAlive(); + if (!mInCall && enableKeepAlive) enableKeepAlive(); + mInCall = true; mProxy.onCallEstablished(this, mPeerSessionDescription); } |