diff options
| author | Hung-ying Tyan <tyanh@google.com> | 2010-12-20 11:33:23 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-12-20 11:33:23 -0800 |
| commit | 635b2b77b917c1bf20ce135ce6fcc98a6a7be084 (patch) | |
| tree | 84f23f52f23f50c468929fce11888aae3fadaa0c /voip | |
| parent | 38212f6fab534e1381ecf209bdf1b59e4750c664 (diff) | |
| parent | d90bc225b9d6e4f8f69d984aa63062a7b20ac65c (diff) | |
| download | frameworks_base-635b2b77b917c1bf20ce135ce6fcc98a6a7be084.zip frameworks_base-635b2b77b917c1bf20ce135ce6fcc98a6a7be084.tar.gz frameworks_base-635b2b77b917c1bf20ce135ce6fcc98a6a7be084.tar.bz2 | |
am d90bc225: am a936b256: Remove SIP realm/domain check
* commit 'd90bc225b9d6e4f8f69d984aa63062a7b20ac65c':
Remove SIP realm/domain check
Diffstat (limited to 'voip')
| -rw-r--r-- | voip/java/com/android/server/sip/SipSessionGroup.java | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/voip/java/com/android/server/sip/SipSessionGroup.java b/voip/java/com/android/server/sip/SipSessionGroup.java index edf8b52..3275317 100644 --- a/voip/java/com/android/server/sip/SipSessionGroup.java +++ b/voip/java/com/android/server/sip/SipSessionGroup.java @@ -872,8 +872,13 @@ class SipSessionGroup implements SipListener { } return true; } else { - onError(SipErrorCode.INVALID_CREDENTIALS, - "incorrect username or password"); + if (crossDomainAuthenticationRequired(response)) { + onError(SipErrorCode.CROSS_DOMAIN_AUTHENTICATION, + getRealmFromResponse(response)); + } else { + onError(SipErrorCode.INVALID_CREDENTIALS, + "incorrect username or password"); + } return false; } } @@ -1025,10 +1030,7 @@ class SipSessionGroup implements SipListener { return true; case Response.UNAUTHORIZED: case Response.PROXY_AUTHENTICATION_REQUIRED: - if (crossDomainAuthenticationRequired(response)) { - onError(SipErrorCode.CROSS_DOMAIN_AUTHENTICATION, - getRealmFromResponse(response)); - } else if (handleAuthentication(event)) { + if (handleAuthentication(event)) { addSipSession(this); } return true; |