Merge "Do not suppress error feedback during a SIP call." into gingerbread (d7116ff1) · Commits · e / os / android_frameworks_base

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

+0 −6

Original line number	Original line	Diff line number	Diff line
	@@ -656,12 +656,6 @@ public class SipPhone extends SipPhoneBase {
	@Override		@Override
	protected void onError(DisconnectCause cause) {		protected void onError(DisconnectCause cause) {
	if (DEBUG) Log.d(LOG_TAG, "SIP error: " + 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);		onCallEnded(cause);
	}		}
	};		};

+1 −11

Original line number	Original line	Diff line number	Diff line
	@@ -1163,11 +1163,6 @@ class SipSessionGroup implements SipListener {
	mProxy.onCallEstablished(this, mPeerSessionDescription);		mProxy.onCallEstablished(this, mPeerSessionDescription);
	}		}

	private void fallbackToPreviousInCall(int errorCode, String message) {
	mState = SipSession.State.IN_CALL;
	mProxy.onCallChangeFailed(this, errorCode, message);
	}

	private void endCallNormally() {		private void endCallNormally() {
	reset();		reset();
	mProxy.onCallEnded(this);		mProxy.onCallEnded(this);
	@@ -1191,14 +1186,9 @@ class SipSessionGroup implements SipListener {
	onRegistrationFailed(errorCode, message);		onRegistrationFailed(errorCode, message);
	break;		break;
	default:		default:
	if ((errorCode != SipErrorCode.DATA_CONNECTION_LOST)
	&& mInCall) {
	fallbackToPreviousInCall(errorCode, message);
	} else {
	endCallOnError(errorCode, message);		endCallOnError(errorCode, message);
	}		}
	}		}
	}


	private void onError(Throwable exception) {		private void onError(Throwable exception) {