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

Commit b70ab322 authored by Jack Yu's avatar Jack Yu Committed by Gerrit Code Review
Browse files

Merge changes from topic "data_handover" 

* changes:
  Supported data handover in DcTracker/DataConnection/ApnContext
  Route network requests to corresponding DcTracker
parents 22f7e88f 39c5f896

src/java/com/android/internal/telephony/NetworkRegistrationManager.java

+4 −3
Original line number Diff line number Diff line
@@ -84,12 +84,13 @@ public class NetworkRegistrationManager { 


    private final Map<NetworkRegStateCallback, Message> mCallbackTable = new Hashtable();



    public void getNetworkRegistrationState(int domain, Message onCompleteMessage) {

    public void getNetworkRegistrationState(@NetworkRegistrationState.Domain int domain,

                                            Message onCompleteMessage) {

        if (onCompleteMessage == null) return;



        logd("getNetworkRegistrationState domain " + domain);

        if (!isServiceConnected()) {

            logd("service not connected.");

            loge("service not connected. Domain = "

                    + ((domain == NetworkRegistrationState.DOMAIN_CS) ? "CS" : "PS"));

            onCompleteMessage.obj = new AsyncResult(onCompleteMessage.obj, null,

                    new IllegalStateException("Service not connected."));

            onCompleteMessage.sendToTarget();

src/java/com/android/internal/telephony/TransportManager.java

+58 −15
Original line number Diff line number Diff line
@@ -21,22 +21,27 @@ import android.annotation.NonNull; 
import android.os.AsyncResult;

import android.os.Handler;

import android.os.Message;

import android.telephony.AccessNetworkConstants.AccessNetworkType;

import android.telephony.AccessNetworkConstants.TransportType;

import android.telephony.CarrierConfigManager;

import android.telephony.Rlog;

import android.telephony.data.ApnSetting.ApnType;

import android.text.TextUtils;



import com.android.internal.telephony.Phone;

import com.android.internal.telephony.dataconnection.AccessNetworksManager.QualifiedNetworks;

import com.android.internal.util.ArrayUtils;

import com.android.internal.util.IndentingPrintWriter;



import java.io.FileDescriptor;

import java.io.PrintWriter;

import java.lang.annotation.Retention;

import java.lang.annotation.RetentionPolicy;

import java.util.ArrayList;

import java.util.Arrays;

import java.util.HashMap;

import java.util.List;

import java.util.Map;

import java.util.concurrent.ConcurrentHashMap;

import java.util.stream.Collectors;



/**

 * This class represents the transport manager which manages available transports (i.e. WWAN or
@@ -46,7 +51,17 @@ import java.util.List; 
public class TransportManager extends Handler {

    private static final String TAG = TransportManager.class.getSimpleName();



    private static final boolean DBG = true;

    private static final Map<Integer, Integer> ACCESS_NETWORK_TRANSPORT_TYPE_MAP;



    static {

        ACCESS_NETWORK_TRANSPORT_TYPE_MAP = new HashMap<>();

        ACCESS_NETWORK_TRANSPORT_TYPE_MAP.put(AccessNetworkType.UNKNOWN, TransportType.WWAN);

        ACCESS_NETWORK_TRANSPORT_TYPE_MAP.put(AccessNetworkType.GERAN, TransportType.WWAN);

        ACCESS_NETWORK_TRANSPORT_TYPE_MAP.put(AccessNetworkType.UTRAN, TransportType.WWAN);

        ACCESS_NETWORK_TRANSPORT_TYPE_MAP.put(AccessNetworkType.EUTRAN, TransportType.WWAN);

        ACCESS_NETWORK_TRANSPORT_TYPE_MAP.put(AccessNetworkType.CDMA2000, TransportType.WWAN);

        ACCESS_NETWORK_TRANSPORT_TYPE_MAP.put(AccessNetworkType.IWLAN, TransportType.WLAN);

    }



    private static final int EVENT_QUALIFIED_NETWORKS_CHANGED = 1;
@@ -87,6 +102,12 @@ public class TransportManager extends Handler { 


    private final AccessNetworksManager mAccessNetworksManager;



    /**

     * Available networks. The key is the APN type, and the value is the available network list in

     * the preferred order.

     */

    private final Map<Integer, int[]> mCurrentAvailableNetworks;



    public TransportManager(Phone phone) {

        mPhone = phone;

        mAccessNetworksManager = new AccessNetworksManager(phone);
@@ -94,6 +115,8 @@ public class TransportManager extends Handler { 
        mAccessNetworksManager.registerForQualifiedNetworksChanged(this,

                EVENT_QUALIFIED_NETWORKS_CHANGED);



        mCurrentAvailableNetworks = new ConcurrentHashMap<>();



        if (isInLegacyMode()) {

            // For legacy mode, WWAN is the only transport to handle all data connections, even

            // the IWLAN ones.
@@ -117,9 +140,11 @@ public class TransportManager extends Handler { 
        }

    }



    private synchronized void updateAvailableNetworks(List<QualifiedNetworks> networks) {

        log("updateAvailableNetworks: " + networks);

        //TODO: Update available networks and transports.

    private synchronized void updateAvailableNetworks(List<QualifiedNetworks> networksList) {

        log("updateAvailableNetworks: " + networksList);

        for (QualifiedNetworks networks : networksList) {

            mCurrentAvailableNetworks.put(networks.apnType, networks.qualifiedNetworks);

        }

    }



    /**
@@ -150,16 +175,35 @@ public class TransportManager extends Handler { 
    }



    /**

     * Get the corresponding transport based on the APN type

     * Get the transport based on the APN type

     *

     * @param apnType APN type

     * @return The transport type

     */

    public int getCurrentTransport(@ApnType int apnType) {

        // TODO: Look up the transport from the transport type map

        // In legacy mode, always route to cellular.

        if (isInLegacyMode()) {

            return TransportType.WWAN;

        }



        // If we can't find the available networks, always route to cellular.

        if (!mCurrentAvailableNetworks.containsKey(apnType)) {

            return TransportType.WWAN;

        }



        int[] availableNetworks = mCurrentAvailableNetworks.get(apnType);



        // If the available networks list is empty, route to cellular.

        if (ArrayUtils.isEmpty(availableNetworks)) {

            return TransportType.WWAN;

        }



        // TODO: For now we choose the first network because it's the most preferred one. In the

        // the future we should validate it to make sure this network does not violate carrier

        // preference and user preference.

        return ACCESS_NETWORK_TRANSPORT_TYPE_MAP.get(availableNetworks[0]);

    }



    /**

     * Dump the state of transport manager

     *
@@ -171,12 +215,11 @@ public class TransportManager extends Handler { 
        IndentingPrintWriter pw = new IndentingPrintWriter(printwriter, "  ");

        pw.println("TransportManager:");

        pw.increaseIndent();

        pw.print("mAvailableTransports=");

        List<String> transportsStrings = new ArrayList<>();

        for (int i = 0; i < mAvailableTransports.length; i++) {

            transportsStrings.add(TransportType.toString(mAvailableTransports[i]));

        }

        pw.println("[" + TextUtils.join(",", transportsStrings) + "]");

        pw.println("mAvailableTransports=[" + Arrays.stream(mAvailableTransports)

                .mapToObj(type -> TransportType.toString(type))

                .collect(Collectors.joining(",")) + "]");

        pw.println("isInLegacy=" + isInLegacyMode());

        pw.println("IWLAN operation mode=" + mPhone.mCi.getIwlanOperationMode());

        mAccessNetworksManager.dump(fd, pw, args);

        pw.decreaseIndent();

        pw.flush();

src/java/com/android/internal/telephony/dataconnection/AccessNetworksManager.java

+13 −10
Original line number Diff line number Diff line
@@ -47,6 +47,7 @@ import java.io.FileDescriptor; 
import java.util.ArrayList;

import java.util.Arrays;

import java.util.List;

import java.util.stream.Collectors;



/**

 * Access network manager manages the qualified/available networks for mobile data connection.
@@ -80,6 +81,7 @@ public class AccessNetworksManager { 


    private QualifiedNetworksServiceConnection mServiceConnection;



    // Available networks. Key is the APN type.

    private final SparseArray<int[]> mAvailableNetworks = new SparseArray<>();



    private final RegistrantList mQualifiedNetworksChangedRegistrants = new RegistrantList();
@@ -119,7 +121,9 @@ public class AccessNetworksManager { 
            return "[QualifiedNetworks: apnType="

                    + ApnSetting.getApnTypeString(apnType)

                    + ", networks="

                    + TextUtils.join(", ", accessNetworkStrings)

                    + Arrays.stream(qualifiedNetworks)

                    .mapToObj(type -> AccessNetworkType.toString(type))

                    .collect(Collectors.joining(","))

                    + "]";

        }

    }
@@ -160,9 +164,11 @@ public class AccessNetworksManager { 
            IQualifiedNetworksServiceCallback.Stub {

        @Override

        public void onQualifiedNetworkTypesChanged(int apnTypes, int[] qualifiedNetworkTypes) {

            log("onQualifiedNetworkTypesChanged. apnTypes = "

            log("onQualifiedNetworkTypesChanged. apnTypes = ["

                    + ApnSetting.getApnTypesStringFromBitmask(apnTypes)

                    + ", networks = " + Arrays.toString(qualifiedNetworkTypes));

                    + "], networks = [" + Arrays.stream(qualifiedNetworkTypes)

                    .mapToObj(i -> AccessNetworkType.toString(i)).collect(Collectors.joining(","))

                    + "]");

            List<QualifiedNetworks> qualifiedNetworksList = new ArrayList<>();

            for (int supportedApnType : SUPPORTED_APN_TYPES) {

                if ((apnTypes & supportedApnType) == supportedApnType) {
@@ -316,13 +322,10 @@ public class AccessNetworksManager { 
        pw.increaseIndent();



        for (int i = 0; i < mAvailableNetworks.size(); i++) {

            pw.print("APN type "

                    + ApnSetting.getApnTypeString(mAvailableNetworks.keyAt(i)) + ": ");

            List<String> networksStrings = new ArrayList<>();

            for (int network : mAvailableNetworks.valueAt(i)) {

                networksStrings.add(AccessNetworkType.toString(network));

            }

            pw.println("[" + TextUtils.join(",", networksStrings) + "]");

            pw.println("APN type " + ApnSetting.getApnTypeString(mAvailableNetworks.keyAt(i))

                    + ": [" + Arrays.stream(mAvailableNetworks.valueAt(i))

                    .mapToObj(type -> AccessNetworkType.toString(type))

                    .collect(Collectors.joining(",")) + "]");

        }

        pw.decreaseIndent();

        pw.decreaseIndent();

src/java/com/android/internal/telephony/dataconnection/ApnContext.java

+11 −12
Original line number Diff line number Diff line
@@ -32,12 +32,13 @@ import com.android.internal.R; 
import com.android.internal.telephony.DctConstants;

import com.android.internal.telephony.Phone;

import com.android.internal.telephony.RetryManager;

import com.android.internal.telephony.dataconnection.DcTracker.ReleaseNetworkType;

import com.android.internal.telephony.dataconnection.DcTracker.RequestNetworkType;

import com.android.internal.util.IndentingPrintWriter;



import java.io.FileDescriptor;

import java.io.PrintWriter;

import java.util.ArrayList;

import java.util.List;

import java.util.concurrent.atomic.AtomicBoolean;

import java.util.concurrent.atomic.AtomicInteger;
@@ -412,19 +413,21 @@ public class ApnContext { 
        }

    }



    public void requestNetwork(NetworkRequest networkRequest, LocalLog log) {

    public void requestNetwork(NetworkRequest networkRequest,

                               @RequestNetworkType int type, LocalLog log) {

        synchronized (mRefCountLock) {

            if (mLocalLogs.contains(log) || mNetworkRequests.contains(networkRequest)) {

                log.log("ApnContext.requestNetwork has duplicate add - " + mNetworkRequests.size());

            } else {

                mLocalLogs.add(log);

                mNetworkRequests.add(networkRequest);

                mDcTracker.enableApn(ApnSetting.getApnTypesBitmaskFromString(mApnType));

                mDcTracker.enableApn(ApnSetting.getApnTypesBitmaskFromString(mApnType), type);

            }

        }

    }



    public void releaseNetwork(NetworkRequest networkRequest, LocalLog log) {

    public void releaseNetwork(NetworkRequest networkRequest, @ReleaseNetworkType int type,

                               LocalLog log) {

        synchronized (mRefCountLock) {

            if (mLocalLogs.contains(log) == false) {

                log.log("ApnContext.releaseNetwork can't find this log");
@@ -438,19 +441,15 @@ public class ApnContext { 
                mNetworkRequests.remove(networkRequest);

                log.log("ApnContext.releaseNetwork left with " + mNetworkRequests.size() +

                        " requests.");

                if (mNetworkRequests.size() == 0) {

                    mDcTracker.disableApn(ApnSetting.getApnTypesBitmaskFromString(mApnType));

                if (mNetworkRequests.size() == 0

                        || type == DcTracker.RELEASE_TYPE_DETACH

                        || type == DcTracker.RELEASE_TYPE_HANDOVER) {

                    mDcTracker.disableApn(ApnSetting.getApnTypesBitmaskFromString(mApnType), type);

                }

            }

        }

    }



    public List<NetworkRequest> getNetworkRequests() {

        synchronized (mRefCountLock) {

            return new ArrayList<NetworkRequest>(mNetworkRequests);

        }

    }



    /**

     * @param excludeDun True if excluding requests that have DUN capability

     * @return True if the attached network requests contain restricted capability.