commit 96c4ff0ecac45ffe5d9b2dd7c404ff853d3797da
author Hunsuk Choi <forestchoi@google.com> Fri Jul 14 12:49:26 2023 +0000
committer Hunsuk Choi <forestchoi@google.com> Sat Feb 03 06:16:46 2024 +0000
tree 51b789efd6c88e68019bf497254754bbcb6277cb
parent 3d9655c7173b48dcf12cb5b79bb1cdd92c5f41e9

Implement resetScan of onRequestEmergencyNetworkScan

Make DomainSelector be able to reset scan history
before requesting next scan if needed.

Bug: 258112541
Test: atest EmergencyCallDomainSelectionTestOnMockModem
Change-Id: Ia01103f4dad7d0f21f462dce1ce8cba4609bd01b

telephony/java/android/telephony/DomainSelectionService.java

diff --git a/telephony/java/android/telephony/DomainSelectionService.java b/telephony/java/android/telephony/DomainSelectionService.java
index 5ada975..0f54e8d 100644
--- a/telephony/java/android/telephony/DomainSelectionService.java
+++ b/telephony/java/android/telephony/DomainSelectionService.java
@@ -695,7 +695,7 @@
 
         @Override
         public void onRequestEmergencyNetworkScan(@NonNull List<Integer> preferredNetworks,
-                @EmergencyScanType int scanType,  boolean resetScan,
+                @EmergencyScanType int scanType, boolean resetScan,
                 @NonNull CancellationSignal signal,
                 @NonNull Consumer<EmergencyRegResult> consumer) {
             try {
@@ -703,7 +703,7 @@
                 mResultCallback = new IWwanSelectorResultCallbackAdapter(consumer, mExecutor);
                 mCallback.onRequestEmergencyNetworkScan(
                         preferredNetworks.stream().mapToInt(Integer::intValue).toArray(),
-                        scanType, mResultCallback);
+                        scanType, resetScan, mResultCallback);
             } catch (Exception e) {
                 Rlog.e(TAG, "onRequestEmergencyNetworkScan e=" + e);
             }

telephony/java/com/android/internal/telephony/IWwanSelectorCallback.aidl

diff --git a/telephony/java/com/android/internal/telephony/IWwanSelectorCallback.aidl b/telephony/java/com/android/internal/telephony/IWwanSelectorCallback.aidl
index 94e7c87..87955ac 100644
--- a/telephony/java/com/android/internal/telephony/IWwanSelectorCallback.aidl
+++ b/telephony/java/com/android/internal/telephony/IWwanSelectorCallback.aidl
@@ -20,7 +20,7 @@
 
 oneway interface IWwanSelectorCallback {
     void onRequestEmergencyNetworkScan(in int[] preferredNetworks,
-            int scanType, in IWwanSelectorResultCallback cb);
+            int scanType, boolean resetScan, in IWwanSelectorResultCallback cb);
     void onDomainSelected(int domain, boolean useEmergencyPdn);
     void onCancel();
 }