Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8d9e8de2 authored by Hung-ying Tyan's avatar Hung-ying Tyan Committed by Android Git Automerger
Browse files

am 096df819: Merge "SipService: send SERVER_ERROR if server doesn\'t provide... 

am 096df819: Merge "SipService: send SERVER_ERROR if server doesn\'t provide nonce" into gingerbread

Merge commit '096df819' into gingerbread-plus-aosp

* commit '096df819':
  SipService: send SERVER_ERROR if server doesn't provide nonce
parents 79a1ee42 096df819

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

+12 −3
Original line number Diff line number Diff line
@@ -712,10 +712,16 @@ class SipSessionGroup implements SipListener { 
                case Response.UNAUTHORIZED:

                case Response.PROXY_AUTHENTICATION_REQUIRED:

                    if (!handleAuthentication(event)) {

                        if (mLastNonce == null) {

                            onRegistrationFailed(SipErrorCode.SERVER_ERROR,

                                    "server does not provide challenge");

                        } else {

                            Log.v(TAG, "Incorrect username/password");

                        onRegistrationFailed(SipErrorCode.INVALID_CREDENTIALS,

                            onRegistrationFailed(

                                    SipErrorCode.INVALID_CREDENTIALS,

                                    "incorrect username or password");

                        }

                    }

                    return true;

                default:

                    if (statusCode >= 500) {
@@ -869,6 +875,9 @@ class SipSessionGroup implements SipListener { 
                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");