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

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

Merge "Add boolean isInEcm(Phone) to EmergencyStateTracker" into 24D1-dev

parents 473f734d ef55adfd

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

+9 −0
Original line number Diff line number Diff line
@@ -1235,6 +1235,15 @@ public class EmergencyStateTracker { 
                && mEmergencyCallDomain == NetworkRegistrationInfo.DOMAIN_CS && isInEcm();

    }



    /**

     * Returns {@code true} if currently in emergency callback mode with the given {@link Phone}.

     *

     * @param phone the {@link Phone} for the emergency call.

     */

    public boolean isInEcm(Phone phone) {

        return isInEcm() && isSamePhone(mPhone, phone);

    }



    private void sendEmergencyCallStateChange(Phone phone, boolean isAlive) {

        if ((isAlive && !mSentEmergencyCallState && getBroadcastEmergencyCallStateChanges(phone))

                || (!isAlive && mSentEmergencyCallState)) {

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

+3 −0
Original line number Diff line number Diff line
@@ -577,6 +577,9 @@ public class EmergencyStateTrackerTest extends TelephonyTest { 
        assertTrue(emergencyStateTracker.isInEcm());

        assertFalse(emergencyStateTracker.isInCdmaEcm());

        assertTrue(emergencyStateTracker.isInImsEcm());



        assertTrue(emergencyStateTracker.isInEcm(testPhone));

        assertFalse(emergencyStateTracker.isInEcm(getPhone(1)));

    }



    /**