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

Commit d6f1c258 authored by Tyler Gunn's avatar Tyler Gunn Committed by android-build-merger
Browse files

Merge "Handle SIP 380 code mapped from the modem." am: 08346c7d 

am: a4d6e2b2

Change-Id: I2c2d3a71028fea20caca833ba5525fe116ad2b26
parents e6fc44c5 a4d6e2b2

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

+2 −0
Original line number Diff line number Diff line
@@ -1946,6 +1946,8 @@ public class ImsPhoneCallTracker extends CallTracker implements ImsPullCall { 


        int code = maybeRemapReasonCode(reasonInfo);

        switch (code) {

            case ImsReasonInfo.CODE_SIP_ALTERNATE_EMERGENCY_CALL:

                return DisconnectCause.IMS_SIP_ALTERNATE_EMERGENCY_CALL;

            case ImsReasonInfo.CODE_SIP_BAD_ADDRESS:

            case ImsReasonInfo.CODE_SIP_NOT_REACHABLE:

                return DisconnectCause.NUMBER_UNREACHABLE;

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

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

    }



    @Test

    @SmallTest

    public void testImsAlternateEmergencyDisconnect() {

        assertEquals(DisconnectCause.IMS_SIP_ALTERNATE_EMERGENCY_CALL,

                mCTUT.getDisconnectCauseFromReasonInfo(

                        new ImsReasonInfo(ImsReasonInfo.CODE_SIP_ALTERNATE_EMERGENCY_CALL, 0),

                        Call.State.ACTIVE));

    }



    @Test

    @SmallTest

    public void testLowBatteryDisconnectDialing() {