summaryrefslogtreecommitdiffstats
path: root/voip/java/android/net/sip
diff options
context:
space:
mode:
authorHung-ying Tyan <tyanh@google.com>2010-09-27 11:47:32 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-09-27 11:47:32 -0700
commit031d8786824a385fa47750e5e8aa75f40d70cae9 (patch)
treea9f52087b62eb2b194502b82447b5bc6d2e94fbb /voip/java/android/net/sip
parent2b0fa71c1a9e588fc31944baa5a21c362a0ab1ca (diff)
parentfe2d279c5ef571340f20d433badd9f68072299af (diff)
downloadframeworks_base-031d8786824a385fa47750e5e8aa75f40d70cae9.zip
frameworks_base-031d8786824a385fa47750e5e8aa75f40d70cae9.tar.gz
frameworks_base-031d8786824a385fa47750e5e8aa75f40d70cae9.tar.bz2
am fe2d279c: am 00a22064: SipService: handle cross-domain authentication error
Merge commit 'fe2d279c5ef571340f20d433badd9f68072299af' * commit 'fe2d279c5ef571340f20d433badd9f68072299af': SipService: handle cross-domain authentication error
Diffstat (limited to 'voip/java/android/net/sip')
-rw-r--r--voip/java/android/net/sip/SipErrorCode.java5
1 files changed, 5 insertions, 0 deletions
diff --git a/voip/java/android/net/sip/SipErrorCode.java b/voip/java/android/net/sip/SipErrorCode.java
index 7496d28..eb7a1ae 100644
--- a/voip/java/android/net/sip/SipErrorCode.java
+++ b/voip/java/android/net/sip/SipErrorCode.java
@@ -58,6 +58,9 @@ public class SipErrorCode {
/** When data connection is lost. */
public static final int DATA_CONNECTION_LOST = -10;
+ /** Cross-domain authentication required. */
+ public static final int CROSS_DOMAIN_AUTHENTICATION = -11;
+
public static String toString(int errorCode) {
switch (errorCode) {
case NO_ERROR:
@@ -82,6 +85,8 @@ public class SipErrorCode {
return "IN_PROGRESS";
case DATA_CONNECTION_LOST:
return "DATA_CONNECTION_LOST";
+ case CROSS_DOMAIN_AUTHENTICATION:
+ return "CROSS_DOMAIN_AUTHENTICATION";
default:
return "UNKNOWN";
}