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

Commit a6def0c9 authored by Tyler Gunn's avatar Tyler Gunn
Browse files

Remap CODE_SIP_BAD_REQUEST to SERVER_ERROR for outgoing calls. 

The vendor IMS stack can report a number of disconnect causes for
incoming calls which were rejected on the device by the lower levels and
as a consequence become "auto missed calls".
CODE_SIP_BAD_REQUEST is one of the codes that can be reported which we
will attribute as an "auto missed call".
However, it is ALSO possible for an outgoing call to return that same
disconnect code, which we should not remap to the auto rejected cause.
Added a check to ensure that if the call state is dialing or alerting we
will remap to SERVER_ERROR rather than the auto-missed disconnect code.
This ensures failed outgoing calls don't get treated as missed incomign
calls.

Fixes: 281320323
Test: Added unit test for disconnect cause remapping.
Change-Id: Ib272858cca7f6bd1694183e7f090fe1cdbe45b27
parent d4a88433

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() {