commit 096df8197b9133703d2ed0abb69813db0c8b4129
author Hung-ying Tyan <tyanh@google.com> Tue Sep 14 23:09:26 2010 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Tue Sep 14 23:09:26 2010 -0700
tree 4a57bdf40998eef7040fde3cd4a7dea681658c5d
parent cee0b97eed0a460e2da58500e24d3e4dac5cb9f6
parent 88203cb111cd9605edcdedb402f8f2a96f8f01e1

Merge "SipService: send SERVER_ERROR if server doesn't provide nonce" into gingerbread

services/java/com/android/server/sip/SipSessionGroup.java

diff --git a/services/java/com/android/server/sip/SipSessionGroup.java b/services/java/com/android/server/sip/SipSessionGroup.java
index 06b6ec9..3d002aa 100644
--- a/services/java/com/android/server/sip/SipSessionGroup.java
+++ b/services/java/com/android/server/sip/SipSessionGroup.java
@@ -712,9 +712,15 @@
                 case Response.UNAUTHORIZED:
                 case Response.PROXY_AUTHENTICATION_REQUIRED:
                     if (!handleAuthentication(event)) {
-                        Log.v(TAG, "Incorrect username/password");
-                        onRegistrationFailed(SipErrorCode.INVALID_CREDENTIALS,
-                                "incorrect username or password");
+                        if (mLastNonce == null) {
+                            onRegistrationFailed(SipErrorCode.SERVER_ERROR,
+                                    "server does not provide challenge");
+                        } else {
+                            Log.v(TAG, "Incorrect username/password");
+                            onRegistrationFailed(
+                                    SipErrorCode.INVALID_CREDENTIALS,
+                                    "incorrect username or password");
+                        }
                     }
                     return true;
                 default:
@@ -869,6 +875,9 @@
                 case Response.PROXY_AUTHENTICATION_REQUIRED:
                     if (handleAuthentication(event)) {
                         addSipSession(this);
+                    } else if (mLastNonce == null) {
+                        endCallOnError(SipErrorCode.SERVER_ERROR,
+                                "server does not provide challenge");
                     } else {
                         endCallOnError(SipErrorCode.INVALID_CREDENTIALS,
                                 "incorrect username or password");