diff options
| author | Hung-ying Tyan <tyanh@google.com> | 2010-08-10 20:48:18 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-08-10 20:48:18 -0700 |
| commit | 091c5238a00ca51dc69b8b09459e6ac88e1eb077 (patch) | |
| tree | 5c527c124a1a8dc7556483d8165d236631abeb7e | |
| parent | f57324cf4f82947296f4d1acb9df1f3c9c03134e (diff) | |
| parent | ea4de5bd25b394a1bac6f27b43c4982aace2011e (diff) | |
| download | frameworks_base-091c5238a00ca51dc69b8b09459e6ac88e1eb077.zip frameworks_base-091c5238a00ca51dc69b8b09459e6ac88e1eb077.tar.gz frameworks_base-091c5238a00ca51dc69b8b09459e6ac88e1eb077.tar.bz2 | |
Merge "SipAudioCall: perform local ops before network op in endCall()" into gingerbread
| -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); } |