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

Commit a7d13812 authored by Hunsuk Choi's avatar Hunsuk Choi Committed by Android (Google) Code Review
Browse files

Merge "Change the way to handle test emergency numbers" into main

parents 97854813 7674ec8f

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

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

        setEmergencyModeInProgress(true);





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

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

        if ((mIsTestEmergencyNumber && emergencyType == EMERGENCY_TYPE_CALL)

        if (mIsTestEmergencyNumberForSms && emergencyType == EMERGENCY_TYPE_SMS) {

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

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

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

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

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

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

            // 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 Original line Diff line number Diff line
@@ -1082,11 +1082,9 @@ public class EmergencyStateTrackerTest extends TelephonyTest { 
        processAllMessages();

        processAllMessages();





        assertTrue(emergencyStateTracker.isInEmergencyMode());

        assertTrue(emergencyStateTracker.isInEmergencyMode());

        assertTrue(emergencyStateTracker.isInEmergencyCall());

        assertFalse(emergencyStateTracker.isInEmergencyCall());

        // Expect: DisconnectCause#NOT_DISCONNECTED.

        assertFalse(future.isDone());

        assertEquals(future.getNow(DisconnectCause.ERROR_UNSPECIFIED),

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

                Integer.valueOf(DisconnectCause.NOT_DISCONNECTED));

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

    }

    }





    @Test

    @Test