am 624d5b4e: SIP: add DisconnectCause.SERVER_ERROR (f7e13400) · Commits · e / os / android_frameworks_base

telephony/java/com/android/internal/telephony/Connection.java

+1 −0

Original line number	Diff line number	Diff line
		@@ -42,6 +42,7 @@ public abstract class Connection {
		NUMBER_UNREACHABLE, /* cannot reach the peer */
		INVALID_CREDENTIALS, /* invalid credentials */
		OUT_OF_NETWORK, /* calling from out of network is not allowed */
		SERVER_ERROR, /* server error */
		TIMED_OUT, /* client timed out */
		LOST_SIGNAL,
		LIMIT_EXCEEDED, /* eg GSM ACM limit exceeded */

+3 −1

Original line number	Diff line number	Diff line
		@@ -883,8 +883,10 @@ public class SipPhone extends SipPhoneBase {
		case SipErrorCode.CROSS_DOMAIN_AUTHENTICATION:
		onError(Connection.DisconnectCause.OUT_OF_NETWORK);
		break;
		case SipErrorCode.SOCKET_ERROR:
		case SipErrorCode.SERVER_ERROR:
		onError(Connection.DisconnectCause.SERVER_ERROR);
		break;
		case SipErrorCode.SOCKET_ERROR:
		case SipErrorCode.CLIENT_ERROR:
		default:
		Log.w(LOG_TAG, "error: " + SipErrorCode.toString(errorCode)

+2 −5

Original line number	Diff line number	Diff line
		@@ -82,7 +82,6 @@ class SipSessionGroup implements SipListener {
		private static final boolean DEBUG = true;
		private static final boolean DEBUG_PING = DEBUG && false;
		private static final String ANONYMOUS = "anonymous";
		private static final String SERVER_ERROR_PREFIX = "Response: ";
		private static final int EXPIRY_TIME = 3600; // in seconds
		private static final int CANCEL_CALL_TIMER = 3; // in seconds

		@@ -1099,8 +1098,8 @@ class SipSessionGroup implements SipListener {
		}

		private String createErrorMessage(Response response) {
		return String.format(SERVER_ERROR_PREFIX + "%s (%d)",
		response.getReasonPhrase(), response.getStatusCode());
		return String.format("%s (%d)", response.getReasonPhrase(),
		response.getStatusCode());
		}

		private void establishCall() {
		@@ -1204,8 +1203,6 @@ class SipSessionGroup implements SipListener {
		return SipErrorCode.INVALID_REMOTE_URI;
		} else if (exception instanceof IOException) {
		return SipErrorCode.SOCKET_ERROR;
		} else if (message.startsWith(SERVER_ERROR_PREFIX)) {
		return SipErrorCode.SERVER_ERROR;
		} else {
		return SipErrorCode.CLIENT_ERROR;
		}