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

This project is archived. Its data is read-only.

Commit 943fc668 authored Mar 30, 2022 by Hyunho Committed by Automerger Merge Worker Mar 30, 2022

Add the processing code that the device received the 504 response to the...

Add the processing code that the device received the 504 response to the PUBLISH request am: 3195dc70 am: 5bc043b0

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/net/ims/+/2048563

Change-Id: If8d39d01045d42bde71c8aedad03fe23918997b3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

parents 56c061f4 5bc043b0

src/java/com/android/ims/rcs/uce/UceDeviceState.java

+1 −0

Original line number	Diff line number	Diff line
		@@ -255,6 +255,7 @@ public class UceDeviceState {
		// Update the device state based on the given sip code.
		switch (sipCode) {
		case NetworkSipCode.SIP_CODE_FORBIDDEN: // sip 403
		case NetworkSipCode.SIP_CODE_SERVER_TIMEOUT: // sip 504
		if (requestType == UceController.REQUEST_TYPE_PUBLISH) {
		// Provisioning error for publish request.
		setDeviceState(DEVICE_STATE_PROVISION_ERROR);

src/java/com/android/ims/rcs/uce/presence/publish/PublishRequestResponse.java

+1 −0

Original line number	Diff line number	Diff line
		@@ -352,6 +352,7 @@ public class PublishRequestResponse {
		return RcsUceAdapter.PUBLISH_STATE_OK;
		case NetworkSipCode.SIP_CODE_FORBIDDEN:
		case NetworkSipCode.SIP_CODE_NOT_FOUND:
		case NetworkSipCode.SIP_CODE_SERVER_TIMEOUT:
		return RcsUceAdapter.PUBLISH_STATE_RCS_PROVISION_ERROR;
		case NetworkSipCode.SIP_CODE_REQUEST_TIMEOUT:
		return RcsUceAdapter.PUBLISH_STATE_REQUEST_TIMEOUT;

src/java/com/android/ims/rcs/uce/util/NetworkSipCode.java

+1 −0

Original line number	Diff line number	Diff line
		@@ -64,6 +64,7 @@ public class NetworkSipCode {
		int uceError;
		switch (sipCode) {
		case NetworkSipCode.SIP_CODE_FORBIDDEN: // 403
		case NetworkSipCode.SIP_CODE_SERVER_TIMEOUT: // 504
		if(requestType == UceController.REQUEST_TYPE_PUBLISH) {
		// Not provisioned for PUBLISH request.
		uceError = RcsUceAdapter.ERROR_NOT_AUTHORIZED;