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

2010-09-15 13:02:46 -07:00
parent 698ddb0cd6 94e498332a
commit 968735e580
1 changed files with 1 additions and 1 deletions
--- a/telephony/java/com/android/internal/telephony/sip/SipPhone.java
+++ b/telephony/java/com/android/internal/telephony/sip/SipPhone.java
@@ -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) {