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

Commit 3195dc70 authored by Hyunho's avatar Hyunho
Browse files

Add the processing code that the device received the 504 response to the PUBLISH request 

As per AT&T requirements, if a device receives a 504 response to a PUBLISH request, it is treated like a received 403 response.
However, the current AOSP framework is missing for this.

Bug: b/225094509
Test: atest CtsTelephonyTestCases:ImsServiceTest

Change-Id: I43665589e735023de9c8d3d3138e23d094910c19
Merged-In: I43665589e735023de9c8d3d3138e23d094910c19
parent 792ea4aa

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;