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

Commit 5b557819 authored by Tyler Gunn's avatar Tyler Gunn Committed by Automerger Merge Worker
Browse files

Merge "Remap CODE_SIP_BAD_REQUEST to SERVER_ERROR for outgoing calls." into udc-dev am: c689b1f4 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/23413881



Change-Id: I230f742630904f8c232a353dcb80dac0b829c667
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 8663fb79 c689b1f4

src/java/com/android/internal/telephony/imsphone/ImsPhoneCallTracker.java

+7 −0
Original line number Diff line number Diff line
@@ -3389,6 +3389,13 @@ public class ImsPhoneCallTracker extends CallTracker implements ImsPullCall { 
                break;



            case ImsReasonInfo.CODE_SIP_BAD_REQUEST:

                // Auto-missed/rejected calls can sometimes use this reason cause, but if we see it

                // for outgoing calls it is just a server error.

                if (callState == Call.State.DIALING || callState == Call.State.ALERTING) {

                    return DisconnectCause.SERVER_ERROR;

                } else {

                    return DisconnectCause.INCOMING_AUTO_REJECTED;

                }

            case ImsReasonInfo.CODE_REJECT_CALL_ON_OTHER_SUB:

            case ImsReasonInfo.CODE_REJECT_ONGOING_E911_CALL:

            case ImsReasonInfo.CODE_REJECT_ONGOING_CALL_SETUP:

tests/telephonytests/src/com/android/internal/telephony/imsphone/ImsPhoneCallTrackerTest.java

+37 −0
Original line number Diff line number Diff line
@@ -1423,6 +1423,43 @@ public class ImsPhoneCallTrackerTest extends TelephonyTest { 
                new ImsReasonInfo(ImsReasonInfo.CODE_LOW_BATTERY, 0), Call.State.ACTIVE));

    }



    @Test

    @SmallTest

    public void testAutoRejectedCauses() {

        assertEquals(DisconnectCause.INCOMING_AUTO_REJECTED, mCTUT.getDisconnectCauseFromReasonInfo(

                new ImsReasonInfo(ImsReasonInfo.CODE_REJECT_CALL_ON_OTHER_SUB, 0),

                Call.State.INCOMING));

        assertEquals(DisconnectCause.INCOMING_AUTO_REJECTED, mCTUT.getDisconnectCauseFromReasonInfo(

                new ImsReasonInfo(ImsReasonInfo.CODE_REJECT_ONGOING_E911_CALL, 0),

                Call.State.INCOMING));

        assertEquals(DisconnectCause.INCOMING_AUTO_REJECTED, mCTUT.getDisconnectCauseFromReasonInfo(

                new ImsReasonInfo(ImsReasonInfo.CODE_REJECT_ONGOING_CALL_SETUP, 0),

                Call.State.INCOMING));

        assertEquals(DisconnectCause.INCOMING_AUTO_REJECTED, mCTUT.getDisconnectCauseFromReasonInfo(

                new ImsReasonInfo(ImsReasonInfo.CODE_REJECT_MAX_CALL_LIMIT_REACHED, 0),

                Call.State.INCOMING));

        assertEquals(DisconnectCause.INCOMING_AUTO_REJECTED, mCTUT.getDisconnectCauseFromReasonInfo(

                new ImsReasonInfo(ImsReasonInfo.CODE_REJECT_ONGOING_CALL_TRANSFER, 0),

                Call.State.INCOMING));

        assertEquals(DisconnectCause.INCOMING_AUTO_REJECTED, mCTUT.getDisconnectCauseFromReasonInfo(

                new ImsReasonInfo(ImsReasonInfo.CODE_REJECT_ONGOING_CONFERENCE_CALL, 0),

                Call.State.INCOMING));

        assertEquals(DisconnectCause.INCOMING_AUTO_REJECTED, mCTUT.getDisconnectCauseFromReasonInfo(

                new ImsReasonInfo(ImsReasonInfo.CODE_REJECT_ONGOING_HANDOVER, 0),

                Call.State.INCOMING));

        assertEquals(DisconnectCause.INCOMING_AUTO_REJECTED, mCTUT.getDisconnectCauseFromReasonInfo(

                new ImsReasonInfo(ImsReasonInfo.CODE_REJECT_ONGOING_CALL_UPGRADE, 0),

                Call.State.INCOMING));

        assertEquals(DisconnectCause.INCOMING_AUTO_REJECTED, mCTUT.getDisconnectCauseFromReasonInfo(

                new ImsReasonInfo(ImsReasonInfo.CODE_SIP_BAD_REQUEST, 0), Call.State.INCOMING));

        assertEquals(DisconnectCause.INCOMING_AUTO_REJECTED, mCTUT.getDisconnectCauseFromReasonInfo(

                new ImsReasonInfo(ImsReasonInfo.CODE_SIP_BAD_REQUEST, 0), Call.State.WAITING));

        assertEquals(DisconnectCause.SERVER_ERROR, mCTUT.getDisconnectCauseFromReasonInfo(

                new ImsReasonInfo(ImsReasonInfo.CODE_SIP_BAD_REQUEST, 0), Call.State.DIALING));

        assertEquals(DisconnectCause.SERVER_ERROR, mCTUT.getDisconnectCauseFromReasonInfo(

                new ImsReasonInfo(ImsReasonInfo.CODE_SIP_BAD_REQUEST, 0), Call.State.ALERTING));

    }



    @Test

    @SmallTest

    public void testImsAlternateEmergencyDisconnect() {