commit 18ba33fc7c9f54b139e9cc6064814c8ec5b867ce
author Hunsuk Choi <forestchoi@google.com> Tue Feb 13 11:25:33 2024 +0000
committer Hunsuk Choi <forestchoi@google.com> Tue Feb 13 11:29:06 2024 +0000
tree aadac511015c1a50f90856523a6b871001e6a043
parent da0ad4126255ea3688522f86f74c391e10ff79a3

Ignore the result of onWwanSelected if the call has been discarded

Bug: 324543257
Test: atest EmergencyCallDomainSelectorTest
Change-Id: I83619d9ed810c09d734c31756efd151366829705

src/com/android/services/telephony/domainselection/EmergencyCallDomainSelector.java

diff --git a/src/com/android/services/telephony/domainselection/EmergencyCallDomainSelector.java b/src/com/android/services/telephony/domainselection/EmergencyCallDomainSelector.java
index 0b5ef23..f48ea46 100644
--- a/src/com/android/services/telephony/domainselection/EmergencyCallDomainSelector.java
+++ b/src/com/android/services/telephony/domainselection/EmergencyCallDomainSelector.java
@@ -395,6 +395,7 @@
 
     private void reselectDomainInternal() {
         post(() -> {
+            if (mDestroyed) return;
             requestScan(true, false, true);
             mDomainSelected = false;
         });
@@ -636,6 +637,8 @@
     }
 
     private void selectDomainFromInitialState() {
+        if (mDestroyed) return;
+
         boolean csInService = isCsInService();
         boolean psInService = isPsInService();