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

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

am 968735e5: Merge "Fixing the NPE in SipPhone bug id: http://b/2987816" into gingerbread 

Merge commit '968735e5' into gingerbread-plus-aosp

* commit '968735e5':
  Fixing the NPE in SipPhone
parents 6962aff3 968735e5

telephony/java/com/android/internal/telephony/sip/SipPhone.java

+1 −1
Original line number Diff line number Diff line
@@ -754,7 +754,7 @@ public class SipPhone extends SipPhoneBase { 
                Log.v(LOG_TAG, "hangup conn: " + mPeer.getUriString() + ": "

                        + ": on phone " + getPhone().getPhoneName());

                try {

                    mSipAudioCall.endCall();

                    if (mSipAudioCall != null) mSipAudioCall.endCall();

                    setState(Call.State.DISCONNECTING);

                    setDisconnectCause(DisconnectCause.LOCAL);

                } catch (SipException e) {