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

Commit 8558c3a8 authored by Daniel Banta's avatar Daniel Banta
Browse files

Fix DomainSelectionResolver in GsmCdmaPhoneTest.java 

Test: atest frameworks/opt/telephony/tests/telephonytests/src/com/android/internal/telephony/GsmCdmaPhoneTest.java
Bug: 266149976
Change-Id: I6fd3688bf7512e30940c921f39b88b7328ee5b02
parent abd36efd

tests/telephonytests/src/com/android/internal/telephony/GsmCdmaPhoneTest.java

+5 −2
Original line number Diff line number Diff line
@@ -130,6 +130,7 @@ public class GsmCdmaPhoneTest extends TelephonyTest { 
    private UiccSlot mUiccSlot;

    private CommandsInterface mMockCi;

    private AdnRecordCache adnRecordCache;

    private DomainSelectionResolver mDomainSelectionResolver;



    //mPhoneUnderTest

    private GsmCdmaPhone mPhoneUT;
@@ -169,10 +170,11 @@ public class GsmCdmaPhoneTest extends TelephonyTest { 
        mUiccPort = Mockito.mock(UiccPort.class);

        mMockCi = Mockito.mock(CommandsInterface.class);

        adnRecordCache = Mockito.mock(AdnRecordCache.class);

        mDomainSelectionResolver = Mockito.mock(DomainSelectionResolver.class);

        doReturn(false).when(mSST).isDeviceShuttingDown();

        doReturn(true).when(mImsManager).isVolteEnabledByPlatform();



        DomainSelectionResolver.make(mContext, false);

        doReturn(false).when(mDomainSelectionResolver).isDomainSelectionSupported();

        DomainSelectionResolver.setDomainSelectionResolver(mDomainSelectionResolver);



        mPhoneUT = new GsmCdmaPhone(mContext, mSimulatedCommands, mNotifier, true, 0,

            PhoneConstants.PHONE_TYPE_GSM, mTelephonyComponentFactory, (c, p) -> mImsManager);
@@ -190,6 +192,7 @@ public class GsmCdmaPhoneTest extends TelephonyTest { 
    public void tearDown() throws Exception {

        mPhoneUT.removeCallbacksAndMessages(null);

        mPhoneUT = null;

        DomainSelectionResolver.setDomainSelectionResolver(null);

        try {

            DeviceConfig.setProperties(mPreTestProperties);

        } catch (DeviceConfig.BadConfigException e) {