Merge "Remove redundant code" into main
diff --git a/src/com/android/services/telephony/domainselection/EmergencyCallDomainSelector.java b/src/com/android/services/telephony/domainselection/EmergencyCallDomainSelector.java
index 6bb4e48..0b5ef23 100644
--- a/src/com/android/services/telephony/domainselection/EmergencyCallDomainSelector.java
+++ b/src/com/android/services/telephony/domainselection/EmergencyCallDomainSelector.java
@@ -1411,11 +1411,6 @@
mTransportSelectorCallback.onSelectionTerminated(permanent
? DisconnectCause.EMERGENCY_PERM_FAILURE
: DisconnectCause.EMERGENCY_TEMP_FAILURE);
-
- if (mIsScanRequested && mCancelSignal != null) {
- mCancelSignal.cancel();
- mCancelSignal = null;
- }
}
/** Starts the cross stack timer. */
diff --git a/tests/src/com/android/services/telephony/domainselection/EmergencyCallDomainSelectorTest.java b/tests/src/com/android/services/telephony/domainselection/EmergencyCallDomainSelectorTest.java
index 066f5c0..b9c1845 100644
--- a/tests/src/com/android/services/telephony/domainselection/EmergencyCallDomainSelectorTest.java
+++ b/tests/src/com/android/services/telephony/domainselection/EmergencyCallDomainSelectorTest.java
@@ -87,6 +87,7 @@
import android.net.ConnectivityManager;
import android.net.NetworkRequest;
import android.net.Uri;
+import android.os.CancellationSignal;
import android.os.Handler;
import android.os.HandlerThread;
import android.os.IPowerManager;
@@ -122,6 +123,7 @@
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
+import org.mockito.ArgumentCaptor;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.mockito.invocation.InvocationOnMock;
@@ -2262,13 +2264,24 @@
processAllMessages();
bindImsServiceUnregistered();
+ processAllMessages();
- verifyScanPsPreferred();
+ ArgumentCaptor<CancellationSignal> cancelCaptor =
+ ArgumentCaptor.forClass(CancellationSignal.class);
+
+ verify(mWwanSelectorCallback, times(1)).onRequestEmergencyNetworkScan(
+ any(), eq(DomainSelectionService.SCAN_TYPE_NO_PREFERENCE),
+ anyBoolean(), cancelCaptor.capture(), any());
+ assertEquals(EUTRAN, (int) mAccessNetwork.get(0));
mDomainSelector.notifyCrossStackTimerExpired();
verify(mTransportSelectorCallback)
.onSelectionTerminated(eq(DisconnectCause.EMERGENCY_TEMP_FAILURE));
+
+ CancellationSignal cancelSignal = cancelCaptor.getValue();
+ assertNotNull(cancelSignal);
+ assertFalse(cancelSignal.isCanceled());
}
@Test