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

Commit 9206721d authored by Grant Menke's avatar Grant Menke Committed by Android (Google) Code Review
Browse files

Merge "Cleanup remap_disconnect_cause_sip_request_cancelled" into main

parents 55e9a219 3aac209a

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

+1 −2
Original line number Diff line number Diff line
@@ -3227,8 +3227,7 @@ public class ImsPhoneCallTracker extends CallTracker implements ImsPullCall { 


        int code = maybeRemapReasonCode(reasonInfo);



        if (mFeatureFlags.remapDisconnectCauseSipRequestCancelled() &&

                code == ImsReasonInfo.CODE_SIP_REQUEST_CANCELLED) {

        if (code == ImsReasonInfo.CODE_SIP_REQUEST_CANCELLED) {

            return DisconnectCause.NORMAL;

        }

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

+0 −2
Original line number Diff line number Diff line
@@ -1480,8 +1480,6 @@ public class ImsPhoneCallTrackerTest extends TelephonyTest { 
    @Test

    @SmallTest

    public void testSipRequestCancelled() {

        doReturn(true).when(mFeatureFlags).remapDisconnectCauseSipRequestCancelled();



        assertEquals(DisconnectCause.NORMAL,

                mCTUT.getDisconnectCauseFromReasonInfo(

                        new ImsReasonInfo(ImsReasonInfo.CODE_SIP_REQUEST_CANCELLED, 0),