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

Commit 96c4ff0e authored by Hunsuk Choi's avatar Hunsuk Choi
Browse files

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
parent 3d9655c7

telephony/java/android/telephony/DomainSelectionService.java

+2 −2
Original line number Diff line number Diff line
@@ -703,7 +703,7 @@ public class DomainSelectionService extends Service { 
                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

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ import com.android.internal.telephony.IWwanSelectorResultCallback; 


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();

}