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

Commit ee070b7e authored by Hunsuk Choi's avatar Hunsuk Choi Committed by Automerger Merge Worker
Browse files

Merge "Route GsmCdmaPhone#exitEmergencyCallbackMode() to... 

Merge "Route GsmCdmaPhone#exitEmergencyCallbackMode() to EmergencyStateTracker" into 24D1-dev am: ce1a2af3

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/26450576



Change-Id: I061ba745595a46dd932aaabda1ea9cf888df395e
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents d7314bff ce1a2af3

src/java/com/android/internal/telephony/GsmCdmaPhone.java

+4 −0
Original line number Diff line number Diff line
@@ -4175,6 +4175,10 @@ public class GsmCdmaPhone extends Phone { 
            Rlog.d(LOG_TAG, "exitEmergencyCallbackMode: mImsPhone=" + mImsPhone

                    + " isPhoneTypeGsm=" + isPhoneTypeGsm());

        }

        if (DomainSelectionResolver.getInstance().isDomainSelectionSupported()) {

            EmergencyStateTracker.getInstance().exitEmergencyCallbackMode();

            return;

        }

        if (mImsPhone != null && mImsPhone.isInImsEcm()) {

            mImsPhone.exitEmergencyCallbackMode();

        } else {

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

+5 −1
Original line number Diff line number Diff line
@@ -2712,6 +2712,9 @@ public class GsmCdmaPhoneTest extends TelephonyTest { 
        doReturn(true).when(dsResolver).isDomainSelectionSupported();

        DomainSelectionResolver.setDomainSelectionResolver(dsResolver);



        EmergencyStateTracker est = Mockito.mock(EmergencyStateTracker.class);

        replaceInstance(EmergencyStateTracker.class, "INSTANCE", null, est);



        mPhoneUT.handleMessage(mPhoneUT.obtainMessage(

                GsmCdmaPhone.EVENT_EMERGENCY_CALLBACK_MODE_ENTER));
@@ -2721,7 +2724,8 @@ public class GsmCdmaPhoneTest extends TelephonyTest { 
        mPhoneUT.exitEmergencyCallbackMode();

        processAllMessages();



        verify(mContext, never()).sendStickyBroadcastAsUser(any(), any());

        // Verify that the request is routed to EmergencyStateTracker.

        verify(est).exitEmergencyCallbackMode();

    }



    @Test