diff options
| author | Hung-ying Tyan <tyanh@google.com> | 2010-09-28 07:53:39 +0800 |
|---|---|---|
| committer | Hung-ying Tyan <tyanh@google.com> | 2010-09-28 14:54:13 +0800 |
| commit | 624d5b4e8c20516516d0bff74479b9f5abdfe61c (patch) | |
| tree | e1557296d97610852691a55da3f094cbe7dd5fd3 /telephony | |
| parent | 245475925eff61ee76bde58de69253a889e39d0a (diff) | |
| download | frameworks_base-624d5b4e8c20516516d0bff74479b9f5abdfe61c.zip frameworks_base-624d5b4e8c20516516d0bff74479b9f5abdfe61c.tar.gz frameworks_base-624d5b4e8c20516516d0bff74479b9f5abdfe61c.tar.bz2 | |
SIP: add DisconnectCause.SERVER_ERROR
and fix how SipErrorCode.SERVER_ERROR is determinted from server response, not
from local exceptions.
http://b/issue?id=3041332
Change-Id: Idce67e29858d5c7573b98b7fa1fac074913d71d6
Diffstat (limited to 'telephony')
| -rw-r--r-- | telephony/java/com/android/internal/telephony/Connection.java | 1 | ||||
| -rwxr-xr-x | telephony/java/com/android/internal/telephony/sip/SipPhone.java | 4 |
2 files changed, 4 insertions, 1 deletions
diff --git a/telephony/java/com/android/internal/telephony/Connection.java b/telephony/java/com/android/internal/telephony/Connection.java index 3b6de6f..0d983b5 100644 --- a/telephony/java/com/android/internal/telephony/Connection.java +++ b/telephony/java/com/android/internal/telephony/Connection.java @@ -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 */ diff --git a/telephony/java/com/android/internal/telephony/sip/SipPhone.java b/telephony/java/com/android/internal/telephony/sip/SipPhone.java index 5e7d9ac..bceceda 100755 --- a/telephony/java/com/android/internal/telephony/sip/SipPhone.java +++ b/telephony/java/com/android/internal/telephony/sip/SipPhone.java @@ -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) |