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

Commit 6807ec6f authored by Hunsuk Choi's avatar Hunsuk Choi Committed by Android (Google) Code Review
Browse files

Merge "Implement resetScan of onRequestEmergencyNetworkScan" into main

parents 33334554 96c4ff0e

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

}