commit 1e563f91183d95f5ad2461b7bca864e8f223ef71
author Hung-ying Tyan <tyanh@google.com> Wed Sep 15 13:06:30 2010 -0700
committer Android Git Automerger <android-git-automerger@android.com> Wed Sep 15 13:06:30 2010 -0700
tree 50362998d056f45c3651221eaadf4d2cef16e425
parent 6962aff36be9d91ad40ead326bd54fc90965f6f0
parent 968735e580b7728c6a17aff9b7356f9d74dc6eb3

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

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

* commit '968735e580b7728c6a17aff9b7356f9d74dc6eb3':
  Fixing the NPE in SipPhone

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

diff --git a/telephony/java/com/android/internal/telephony/sip/SipPhone.java b/telephony/java/com/android/internal/telephony/sip/SipPhone.java
index b009786..5af32da 100755
--- a/telephony/java/com/android/internal/telephony/sip/SipPhone.java
+++ b/telephony/java/com/android/internal/telephony/sip/SipPhone.java
@@ -754,7 +754,7 @@
                 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) {