Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 091c5238: Merge "SipAudioCall: perform local ops before network op in endCall()" into gingerbread

Browse Source 
Merge commit '091c5238a00ca51dc69b8b09459e6ac88e1eb077' into gingerbread-plus-aosp

* commit '091c5238a00ca51dc69b8b09459e6ac88e1eb077':
  SipAudioCall: perform local ops before network op in endCall()
This commit is contained in:
Hung-ying Tyan
2010-08-10 20:50:40 -07:00
committed by Android Git Automerger
parent 2c9de2b9e5 091c5238a0
commit 9a025349dc
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
voip/java/android/net/sip/SipAudioCallImpl.java
View File

@@ -343,8 +343,11 @@ public class SipAudioCallImpl extends SipSessionAdapter
public synchronized void endCall() throws SipException { public synchronized void endCall() throws SipException {
try { try {
stopRinging(); stopRinging();
if (mSipSession != null) mSipSession.endCall();
stopCall(true); stopCall(true);
mInCall = false;
// perform the above local ops first and then network op
if (mSipSession != null) mSipSession.endCall();
} catch (Throwable e) { } catch (Throwable e) {
throwSipException(e); throwSipException(e);
} }