commit f8c34ad3efd82974f166419b174431564658a7d0
author Hung-ying Tyan <tyanh@google.com> Sun Jul 03 19:53:35 2011 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Sun Jul 03 19:53:35 2011 -0700
tree f5521c82dd0ed69fee101686e94cd7fddb8b5144
parent c2b8aa0b4c822b0e307f62131650f4a6ee89bb66
parent 8ba4566c01c5848b378d1d86e9041730f5b5a13f

Merge "Do not keep alive for re-established call."

voip/java/com/android/server/sip/SipSessionGroup.java

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 @@
 
         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);
         }