commit 023054117a954e7ec89768b4f49bafe174bbcc95
author Hunsuk Choi <forestchoi@google.com> Mon Feb 13 18:25:20 2023 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Feb 13 18:25:20 2023 +0000
tree a14eb5fbbd51608ee4982148663ed5f0205f6a9c
parent 4a9e8b8e2f5a24f0c2ddcb03a8ad989f717d5f31
parent 73ab60c2f23e7bcd7db7dc0018dcd38946489852

Merge "Change the order of CANCEL_EMERGENCY_NETWORK_SCAN and EXIT_EMERGENCY_MODE"

src/com/android/services/telephony/TelephonyConnectionService.java

diff --git a/src/com/android/services/telephony/TelephonyConnectionService.java b/src/com/android/services/telephony/TelephonyConnectionService.java
index 519655e..31221af 100644
--- a/src/com/android/services/telephony/TelephonyConnectionService.java
+++ b/src/com/android/services/telephony/TelephonyConnectionService.java
@@ -611,9 +611,8 @@
                             Phone phone = mEmergencyCallDomainSelectionConnection.getPhone();
                             mEmergencyConnection.removeTelephonyConnectionListener(
                                     mEmergencyConnectionListener);
-                            mEmergencyStateTracker.endCall(
-                                    mEmergencyConnection.getTelecomCallId());
                             releaseEmergencyCallDomainSelection(true);
+                            mEmergencyStateTracker.endCall(mEmergencyCallId);
                             retryOutgoingOriginalConnection(c, phone, isPermanentFailure);
                         });
                         return;
@@ -2386,8 +2385,8 @@
 
         Log.i(this, "maybeReselectDomainForEmergencyCall endCall()");
         c.removeTelephonyConnectionListener(mEmergencyConnectionListener);
-        mEmergencyStateTracker.endCall(c.getTelecomCallId());
         releaseEmergencyCallDomainSelection(true);
+        mEmergencyStateTracker.endCall(c.getTelecomCallId());
 
         return false;
     }
@@ -2647,8 +2646,8 @@
         if (TextUtils.equals(mEmergencyCallId, c.getTelecomCallId())) {
             Log.i(this, "onLocalHangup " + mEmergencyCallId);
             c.removeTelephonyConnectionListener(mEmergencyConnectionListener);
-            mEmergencyStateTracker.endCall(c.getTelecomCallId());
             releaseEmergencyCallDomainSelection(true);
+            mEmergencyStateTracker.endCall(c.getTelecomCallId());
             mEmergencyCallId = null;
         }
     }