Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4d0e7cd7 authored by Hung-ying Tyan's avatar Hung-ying Tyan Committed by Android Git Automerger
Browse files

am 9a025349: am 091c5238: Merge "SipAudioCall: perform local ops before... 

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

Merge commit '9a025349'

* commit '9a025349':
  SipAudioCall: perform local ops before network op in endCall()
parents a5d4503b 9a025349

voip/java/android/net/sip/SipAudioCallImpl.java

+4 −1
Original line number Diff line number Diff line
@@ -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);

        }