diff options
| author | Hung-ying Tyan <tyanh@google.com> | 2010-08-10 21:54:07 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-08-10 21:54:07 -0700 |
| commit | 4d0e7cd7902c3e093903614f1fc2500c3b694cee (patch) | |
| tree | 418bcfcafa76378dacc2b9e1954d86c1ae15d7ea | |
| parent | a5d4503bc4697fa6e9a3a387dacfbe09050e400c (diff) | |
| parent | 9a025349dc5a4e699fbe99a714f523e9903fa534 (diff) | |
| download | frameworks_base-4d0e7cd7902c3e093903614f1fc2500c3b694cee.zip frameworks_base-4d0e7cd7902c3e093903614f1fc2500c3b694cee.tar.gz frameworks_base-4d0e7cd7902c3e093903614f1fc2500c3b694cee.tar.bz2 | |
am 9a025349: am 091c5238: Merge "SipAudioCall: perform local ops before network op in endCall()" into gingerbread
Merge commit '9a025349dc5a4e699fbe99a714f523e9903fa534'
* commit '9a025349dc5a4e699fbe99a714f523e9903fa534':
SipAudioCall: perform local ops before network op in endCall()
| -rw-r--r-- | voip/java/android/net/sip/SipAudioCallImpl.java | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/voip/java/android/net/sip/SipAudioCallImpl.java b/voip/java/android/net/sip/SipAudioCallImpl.java index 57e0bd2..474bc4b 100644 --- a/voip/java/android/net/sip/SipAudioCallImpl.java +++ b/voip/java/android/net/sip/SipAudioCallImpl.java @@ -343,8 +343,11 @@ public class SipAudioCallImpl extends SipSessionAdapter public synchronized void endCall() throws SipException { try { stopRinging(); - if (mSipSession != null) mSipSession.endCall(); stopCall(true); + mInCall = false; + + // perform the above local ops first and then network op + if (mSipSession != null) mSipSession.endCall(); } catch (Throwable e) { throwSipException(e); } |