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

Commit 810012d5 authored by Hyunho's avatar Hyunho Committed by Automerger Merge Worker
Browse files

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 am: 943fc668

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



Change-Id: I2d9015cdf5bcd5e39ff511a68a4047258e698e4c
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents a31805fe 943fc668

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;