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

Merge commit '1e563f91183d95f5ad2461b7bca864e8f223ef71'

* commit '1e563f91183d95f5ad2461b7bca864e8f223ef71':
  Fixing the NPE in SipPhone

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

@@ -757,7 +757,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) {