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 | 98651c0c02b2f2725635af311d2e4850dacd1903 (patch) | |
| tree | 6acbb059ed04059d8220e48e5b197f4a87ff80a8 /java | |
| parent | 42cdc7a9d3f94260768f38de4f477ec4e418e19a (diff) | |
| parent | 108e51ec4c06c75db2a11d1417f1bc8c0545ea8b (diff) | |
| download | android_frameworks_opt_net_voip-98651c0c02b2f2725635af311d2e4850dacd1903.tar.gz android_frameworks_opt_net_voip-98651c0c02b2f2725635af311d2e4850dacd1903.tar.bz2 android_frameworks_opt_net_voip-98651c0c02b2f2725635af311d2e4850dacd1903.zip | |
Merge "Do not keep alive for re-established call."
Diffstat (limited to 'java')
| -rw-r--r-- | java/com/android/server/sip/SipSessionGroup.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/java/com/android/server/sip/SipSessionGroup.java b/java/com/android/server/sip/SipSessionGroup.java index 047eb8d..4e44402 100644 --- a/java/com/android/server/sip/SipSessionGroup.java +++ b/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); } |