diff options
author | Hung-ying Tyan <tyanh@google.com> | 2010-10-04 23:03:26 -0700 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-10-04 23:03:26 -0700 |
commit | 718e0033e69fa7d1db12242324ab9098ac430bf5 (patch) | |
tree | b2cbf251449d9f488d2454c0f6ac83cf80add0ec /voip/java/com/android | |
parent | 1862af57b2c5ca5387b12974e8ef661651edb97d (diff) | |
parent | c6548fd9eda7b58f5a2e2a9c01e3c7cafd42fafb (diff) | |
download | frameworks_base-718e0033e69fa7d1db12242324ab9098ac430bf5.zip frameworks_base-718e0033e69fa7d1db12242324ab9098ac430bf5.tar.gz frameworks_base-718e0033e69fa7d1db12242324ab9098ac430bf5.tar.bz2 |
Merge "SIP: add SERVER_UNREACHABLE error code." into gingerbread
Diffstat (limited to 'voip/java/com/android')
-rw-r--r-- | voip/java/com/android/server/sip/SipSessionGroup.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/voip/java/com/android/server/sip/SipSessionGroup.java b/voip/java/com/android/server/sip/SipSessionGroup.java index bc377cf..37fffa8 100644 --- a/voip/java/com/android/server/sip/SipSessionGroup.java +++ b/voip/java/com/android/server/sip/SipSessionGroup.java @@ -480,7 +480,7 @@ class SipSessionGroup implements SipListener { public void run() { try { processCommand(command); - } catch (SipException e) { + } catch (Throwable e) { Log.w(TAG, "command error: " + command, e); onError(e); } @@ -1218,7 +1218,7 @@ class SipSessionGroup implements SipListener { private int getErrorCode(Throwable exception) { String message = exception.getMessage(); if (exception instanceof UnknownHostException) { - return SipErrorCode.INVALID_REMOTE_URI; + return SipErrorCode.SERVER_UNREACHABLE; } else if (exception instanceof IOException) { return SipErrorCode.SOCKET_ERROR; } else { |