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

Commit 2a899fd3 authored by Hunsuk Choi's avatar Hunsuk Choi
Browse files

Copy eccCategory member when cloning ImsDialArgs 

Bug: 270101950
Test: atest ImsPhoneTest#testImsDialArgsBuilderFromForAlternateService
Change-Id: Ibdd71bf9ccbafdeeb066ef4ece73bbcdda0883e7
parent 5b524109

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

+1 −0
Original line number Diff line number Diff line
@@ -196,6 +196,7 @@ public class ImsPhone extends ImsPhoneBase { 
                    return new ImsDialArgs.Builder()

                            .setUusInfo(dialArgs.uusInfo)

                            .setIsEmergency(dialArgs.isEmergency)

                            .setEccCategory(dialArgs.eccCategory)

                            .setVideoState(dialArgs.videoState)

                            .setIntentExtras(dialArgs.intentExtras)

                            .setRttTextStream(((ImsDialArgs)dialArgs).rttTextStream)

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

+15 −0
Original line number Diff line number Diff line
@@ -1410,6 +1410,21 @@ public class ImsPhoneTest extends TelephonyTest { 
        assertTrue(regInfo[0] == 1 && regInfo[1] == 1 && regInfo[2] == 1);

    }



    @Test

    @SmallTest

    public void testImsDialArgsBuilderFromForAlternateService() {

        ImsPhone.ImsDialArgs dialArgs = new ImsPhone.ImsDialArgs.Builder()

                .setIsEmergency(true)

                .setEccCategory(2)

                .build();



        ImsPhone.ImsDialArgs copiedDialArgs =

                ImsPhone.ImsDialArgs.Builder.from(dialArgs).build();



        assertTrue(copiedDialArgs.isEmergency);

        assertEquals(2, copiedDialArgs.eccCategory);

    }



    private ServiceState getServiceStateDataAndVoice(int rat, int regState, boolean isRoaming) {

        ServiceState ss = new ServiceState();

        ss.setStateOutOfService();