diff options
| author | Hung-ying Tyan <tyanh@google.com> | 2010-10-04 23:07:43 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-10-04 23:07:43 -0700 |
| commit | a785a59c831256f274627f8f8eb77f9d54508916 (patch) | |
| tree | 6c32968df84a1c299c94c1d921e3796183a5cfa9 /telephony | |
| parent | 3cb2d3be6cb501c77c7a5765d954363125857cca (diff) | |
| parent | 718e0033e69fa7d1db12242324ab9098ac430bf5 (diff) | |
| download | frameworks_base-a785a59c831256f274627f8f8eb77f9d54508916.zip frameworks_base-a785a59c831256f274627f8f8eb77f9d54508916.tar.gz frameworks_base-a785a59c831256f274627f8f8eb77f9d54508916.tar.bz2 | |
am 718e0033: Merge "SIP: add SERVER_UNREACHABLE error code." into gingerbread
Merge commit '718e0033e69fa7d1db12242324ab9098ac430bf5' into gingerbread-plus-aosp
* commit '718e0033e69fa7d1db12242324ab9098ac430bf5':
SIP: add SERVER_UNREACHABLE error code.
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 | 3 |
2 files changed, 4 insertions, 0 deletions
diff --git a/telephony/java/com/android/internal/telephony/Connection.java b/telephony/java/com/android/internal/telephony/Connection.java index 0d983b5..07f90cd 100644 --- a/telephony/java/com/android/internal/telephony/Connection.java +++ b/telephony/java/com/android/internal/telephony/Connection.java @@ -40,6 +40,7 @@ public abstract class Connection { MMI, /* not presently used; dial() returns null */ INVALID_NUMBER, /* invalid dial string */ NUMBER_UNREACHABLE, /* cannot reach the peer */ + SERVER_UNREACHABLE, /* cannot reach the server */ INVALID_CREDENTIALS, /* invalid credentials */ OUT_OF_NETWORK, /* calling from out of network is not allowed */ SERVER_ERROR, /* server error */ diff --git a/telephony/java/com/android/internal/telephony/sip/SipPhone.java b/telephony/java/com/android/internal/telephony/sip/SipPhone.java index 5d8fe1d..4fd4cdd 100755 --- a/telephony/java/com/android/internal/telephony/sip/SipPhone.java +++ b/telephony/java/com/android/internal/telephony/sip/SipPhone.java @@ -875,6 +875,9 @@ public class SipPhone extends SipPhoneBase { public void onError(SipAudioCall call, int errorCode, String errorMessage) { switch (errorCode) { + case SipErrorCode.SERVER_UNREACHABLE: + onError(Connection.DisconnectCause.SERVER_UNREACHABLE); + break; case SipErrorCode.PEER_NOT_REACHABLE: onError(Connection.DisconnectCause.NUMBER_UNREACHABLE); break; |