Merge "SipService: send SERVER_ERROR if server doesn't provide nonce" into gingerbread (096df819) · Commits · e / os / android_frameworks_base

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");