drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Do not suppress error feedback during a SIP call." into gingerbread

Browse Source
This commit is contained in:
Hung-ying Tyan
2010-11-30 22:53:26 -08:00
committed by Android (Google) Code Review
parent 04639ba0a9 4189d99b6e
commit d7116ff1f0
2 changed files with 1 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
telephony/java/com/android/internal/telephony/sip/SipPhone.java
View File

@ -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);
} }
}; };

10
voip/java/com/android/server/sip/SipSessionGroup.java
View File

@ -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) {