diff options
| author | Hung-ying Tyan <tyanh@google.com> | 2010-12-16 11:50:45 +0800 |
|---|---|---|
| committer | Hung-ying Tyan <tyanh@google.com> | 2010-12-17 10:20:06 +0800 |
| commit | a936b256eb1611b5d8b88d0cd61f21225152cc82 (patch) | |
| tree | 29a85b92d4262d0327fbd408e544db608e7b1978 /voip | |
| parent | acf649356b1ab25098277018b5d76f55f9ef660b (diff) | |
| download | frameworks_base-a936b256eb1611b5d8b88d0cd61f21225152cc82.zip frameworks_base-a936b256eb1611b5d8b88d0cd61f21225152cc82.tar.gz frameworks_base-a936b256eb1611b5d8b88d0cd61f21225152cc82.tar.bz2 | |
Remove SIP realm/domain check
as the realm may be different from the domain.
Bug: 3283834
Change-Id: I64c9f0d6d626afdb397c5d378d30afa9d6a64ca9
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; |