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

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

Merge "Change the parameter type of WwanSelectorCallback#onDomainSelected()"

parents 7119c3e5 f0cbf677

telephony/java/android/telephony/DomainSelectionService.java

+10 −4
Original line number Diff line number Diff line
@@ -28,7 +28,6 @@ import android.os.IBinder; 
import android.os.Parcel;

import android.os.Parcelable;

import android.os.RemoteException;

import android.telephony.AccessNetworkConstants.RadioAccessNetworkType;

import android.telephony.Annotation.DisconnectCauses;

import android.telephony.Annotation.PreciseDisconnectCauses;

import android.telephony.ims.ImsReasonInfo;
@@ -703,9 +702,9 @@ public class DomainSelectionService extends Service { 
        }



        @Override

        public void onDomainSelected(@RadioAccessNetworkType int accessNetworkType) {

        public void onDomainSelected(@NetworkRegistrationInfo.Domain int domain) {

            try {

                mCallback.onDomainSelected(accessNetworkType);

                mCallback.onDomainSelected(domain);

            } catch (Exception e) {

                Rlog.e(TAG, "onDomainSelected e=" + e);

            }
@@ -835,7 +834,14 @@ public class DomainSelectionService extends Service { 
        return Runnable::run;

    }



    private @NonNull Executor getCachedExecutor() {

    /**

     * Gets the {@link Executor} which executes methods of this service.

     * This method should be private when this service is implemented in a separated process

     * other than telephony framework.

     * @return {@link Executor} instance.

     * @hide

     */

    public @NonNull Executor getCachedExecutor() {

        synchronized (mExecutorLock) {

            if (mExecutor == null) {

                Executor e = getExecutor();

telephony/java/android/telephony/WwanSelectorCallback.java

+2 −3
Original line number Diff line number Diff line
@@ -18,7 +18,6 @@ package android.telephony; 


import android.annotation.NonNull;

import android.os.CancellationSignal;

import android.telephony.AccessNetworkConstants.RadioAccessNetworkType;

import android.telephony.DomainSelectionService.EmergencyScanType;



import java.util.List;
@@ -46,7 +45,7 @@ public interface WwanSelectorCallback { 
     * Notifies the FW that the domain has been selected. After this method is called,

     * this interface can be discarded.

     *

     * @param accessNetworkType the selected network type.

     * @param domain The selected domain.

     */

    void onDomainSelected(@RadioAccessNetworkType int accessNetworkType);

    void onDomainSelected(@NetworkRegistrationInfo.Domain int domain);

}

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

+1 −1
Original line number Diff line number Diff line
@@ -21,6 +21,6 @@ import com.android.internal.telephony.IWwanSelectorResultCallback; 
oneway interface IWwanSelectorCallback {

    void onRequestEmergencyNetworkScan(in int[] preferredNetworks,

            int scanType, in IWwanSelectorResultCallback cb);

    void onDomainSelected(int accessNetworkType);

    void onDomainSelected(int domain);

    void onCancel();

}