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

Commit 94eb3fe7 authored by Yongnam Cha's avatar Yongnam Cha Committed by Android (Google) Code Review
Browse files

Merge "Notifying ECBM stop, if an emergency call starts during ECBM" into main

parents 2e434702 5b6173cf

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

+5 −0
Original line number Diff line number Diff line
@@ -601,6 +601,11 @@ public class EmergencyStateTracker { 
                    releaseWakeLock();

                    ((GsmCdmaPhone) mPhone).notifyEcbmTimerReset(Boolean.TRUE);



                    if (mFeatureFlags.emergencyCallbackModeNotification()) {

                        mPhone.stopEmergencyCallbackMode(EMERGENCY_CALLBACK_MODE_CALL,

                                STOP_REASON_OUTGOING_EMERGENCY_CALL_INITIATED);

                    }



                    mOngoingCallProperties = 0;

                    mCallEmergencyModeFuture = new CompletableFuture<>();

                    setEmergencyMode(mPhone, EMERGENCY_TYPE_CALL, MODE_EMERGENCY_WWAN,

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

+1 −1
Original line number Diff line number Diff line
@@ -1107,7 +1107,7 @@ public class EmergencyStateTrackerTest extends TelephonyTest { 
        verify(phone0, never()).exitEmergencyMode(any(Message.class));

        verify(phone0, times(2)).startEmergencyCallbackMode(

                eq(EMERGENCY_CALLBACK_MODE_CALL), anyLong());

        verify(phone0, never()).stopEmergencyCallbackMode(

        verify(phone0, times(1)).stopEmergencyCallbackMode(

                eq(EMERGENCY_CALLBACK_MODE_CALL), anyInt());

    }