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

Commit 6db723fd authored by Tyler Gunn's avatar Tyler Gunn
Browse files

Remap "SIP_NOT_FOUND" to INVALID_NUMBER. 

Remapping CODE_SIP_NOT_FOUND error code to INVALID_NUMBER instead of
SERVER_UNREACHABLE.  Apparently SIP_NOT_FOUND is more analogous to
invalid number.

Bug: 111909355
Test: Added unit test
Merged-In: Ibe008c63b5d946013da19b8b9e7d4c9c312d050f
Change-Id: I4e927a565420fa215859fd2eee5b035a30db699f

# Conflicts:
#	tests/telephonytests/src/com/android/internal/telephony/imsphone/ImsPhoneCallTrackerTest.java
parent 08784b50

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

+3 −1
Original line number Diff line number Diff line
@@ -2006,10 +2006,12 @@ public class ImsPhoneCallTracker extends CallTracker implements ImsPullCall { 
                return DisconnectCause.SERVER_ERROR;



            case ImsReasonInfo.CODE_SIP_SERVICE_UNAVAILABLE:

            case ImsReasonInfo.CODE_SIP_NOT_FOUND:

            case ImsReasonInfo.CODE_SIP_SERVER_ERROR:

                return DisconnectCause.SERVER_UNREACHABLE;



            case ImsReasonInfo.CODE_SIP_NOT_FOUND:

                return DisconnectCause.INVALID_NUMBER;



            case ImsReasonInfo.CODE_LOCAL_NETWORK_ROAMING:

            case ImsReasonInfo.CODE_LOCAL_NETWORK_IP_CHANGED:

            case ImsReasonInfo.CODE_LOCAL_IMS_SERVICE_DOWN:

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

+8 −0
Original line number Diff line number Diff line
@@ -812,4 +812,12 @@ public class ImsPhoneCallTrackerTest extends TelephonyTest { 
        }

        verify(mImsPhone, times(1)).startOnHoldTone(nullable(Connection.class));

    }



    @Test

    @SmallTest

    public void testSipNotFoundRemap() {

        assertEquals(DisconnectCause.INVALID_NUMBER,

                mCTUT.getDisconnectCauseFromReasonInfo(

                        new ImsReasonInfo(ImsReasonInfo.CODE_SIP_NOT_FOUND, 0), Call.State.ACTIVE));

    }

}