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

Commit 7674ec8f authored by Hunsuk Choi's avatar Hunsuk Choi
Browse files

Change the way to handle test emergency numbers 

Handle as real emergency numbers

Bug: 322673803
Test: atest EmergencyStateTrackerTest
Change-Id: I14d23c5470ad0b16f852823ac0d1c78449cbe849
parent 6628b3d7

src/java/com/android/internal/telephony/emergency/EmergencyStateTracker.java

+1 −2
Original line number Diff line number Diff line
@@ -647,8 +647,7 @@ public class EmergencyStateTracker { 
        setEmergencyModeInProgress(true);



        Message m = mHandler.obtainMessage(msg, Integer.valueOf(emergencyType));

        if ((mIsTestEmergencyNumber && emergencyType == EMERGENCY_TYPE_CALL)

                || (mIsTestEmergencyNumberForSms && emergencyType == EMERGENCY_TYPE_SMS)) {

        if (mIsTestEmergencyNumberForSms && emergencyType == EMERGENCY_TYPE_SMS) {

            Rlog.d(TAG, "TestEmergencyNumber for " + emergencyTypeToString(emergencyType)

                    + ": Skipping setting emergency mode on modem.");

            // Send back a response for the command, but with null information

tests/telephonytests/src/com/android/internal/telephony/emergency/EmergencyStateTrackerTest.java

+3 −5
Original line number Diff line number Diff line
@@ -1082,11 +1082,9 @@ public class EmergencyStateTrackerTest extends TelephonyTest { 
        processAllMessages();



        assertTrue(emergencyStateTracker.isInEmergencyMode());

        assertTrue(emergencyStateTracker.isInEmergencyCall());

        // Expect: DisconnectCause#NOT_DISCONNECTED.

        assertEquals(future.getNow(DisconnectCause.ERROR_UNSPECIFIED),

                Integer.valueOf(DisconnectCause.NOT_DISCONNECTED));

        verify(phone0, never()).setEmergencyMode(anyInt(), any(Message.class));

        assertFalse(emergencyStateTracker.isInEmergencyCall());

        assertFalse(future.isDone());

        verify(phone0).setEmergencyMode(anyInt(), any(Message.class));

    }



    @Test