am ed34b244: am d7116ff1: Merge "Do not suppress error feedback during a SIP call." into gingerbread

* commit 'ed34b244f1665b604d2a291db504415b10a514d7':
  Do not suppress error feedback during a SIP call.

1 files changed, 0 insertions, 6 deletions

diff --git a/telephony/java/com/android/internal/telephony/sip/SipPhone.java b/telephony/java/com/android/internal/telephony/sip/SipPhone.java
index 1f1338c..58a4cba 100755
--- a/telephony/java/com/android/internal/telephony/sip/SipPhone.java
+++ b/telephony/java/com/android/internal/telephony/sip/SipPhone.java
@@ -659,12 +659,6 @@ public class SipPhone extends SipPhoneBase {
             @Override
             protected void onError(DisconnectCause cause) {
                 if (DEBUG) Log.d(LOG_TAG, "SIP error: " + cause);
-                if (mSipAudioCall.isInCall()
-                        && (cause != DisconnectCause.LOST_SIGNAL)) {
-                    // Don't end the call when in a call.
-                    return;
-                }
-
                 onCallEnded(cause);
             }
         };