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

Commit 3a19e8f3 authored by Ling Ma's avatar Ling Ma
Browse files

retry with traffic descriptor 

Before this change, only APN-based network capability is supported.
However, we'd like to support retry base on traffic descriptor such as
slice bandwidth/latency.

Also replaced a hard coding capability NOT_CONSTRAINED to be the
official API.

Flag: EXEMPT bugfix
Test: voice call + data browsing
Test: atest
Fix: 347619206
Change-Id: I821a64ddb424b1800fad50e4cbcf97af47cca1b5
parent 0fd848ca

src/java/com/android/internal/telephony/data/DataNetwork.java

+1 −1
Original line number Diff line number Diff line
@@ -3360,7 +3360,7 @@ public class DataNetwork extends StateMachine { 
    public int getApnTypeNetworkCapability() {

        if (!mAttachedNetworkRequestList.isEmpty()) {

            // The highest priority network request is always at the top of list.

            return mAttachedNetworkRequestList.get(0).getApnTypeNetworkCapability();

            return mAttachedNetworkRequestList.get(0).getHighestPriorityApnTypeNetworkCapability();

        } else {

            return Arrays.stream(getNetworkCapabilities().getCapabilities()).boxed()

                    .filter(cap -> DataUtils.networkCapabilityToApnType(cap)

src/java/com/android/internal/telephony/data/DataNetworkController.java

+6 −5
Original line number Diff line number Diff line
@@ -1579,7 +1579,7 @@ public class DataNetworkController extends Handler { 
            @NonNull TelephonyNetworkRequest networkRequest, DataEvaluationReason reason) {

        DataEvaluation evaluation = new DataEvaluation(reason);

        int transport = mAccessNetworksManager.getPreferredTransportByNetworkCapability(

                networkRequest.getApnTypeNetworkCapability());

                networkRequest.getHighestPriorityApnTypeNetworkCapability());



        // Check if the request can be satisfied by cellular network or satellite network.

        if (mFeatureFlags.satelliteInternet()
@@ -1711,7 +1711,7 @@ public class DataNetworkController extends Handler { 


        if (mDataSettingsManager.isDataInitialized()) {

            if (!mDataSettingsManager.isDataEnabled(DataUtils.networkCapabilityToApnType(

                    networkRequest.getApnTypeNetworkCapability()))) {

                    networkRequest.getHighestPriorityApnTypeNetworkCapability()))) {

                evaluation.addDataDisallowedReason(DataDisallowedReason.DATA_DISABLED);

            }

        } else {
@@ -1985,7 +1985,7 @@ public class DataNetworkController extends Handler { 
            if (mAllNetworkRequestList.stream()

                    .filter(request -> dataNetwork.getTransport()

                            == mAccessNetworksManager.getPreferredTransportByNetworkCapability(

                                    request.getApnTypeNetworkCapability()))

                                    request.getHighestPriorityApnTypeNetworkCapability()))

                    .filter(request

                            -> !hasCapabilityExemptsFromSinglePdnRule(request.getCapabilities()))

                    .anyMatch(request -> request.getPriority() > dataNetwork.getPriority())) {
@@ -2853,7 +2853,7 @@ public class DataNetworkController extends Handler { 
        }



        int transport = mAccessNetworksManager.getPreferredTransportByNetworkCapability(

                networkRequestList.get(0).getApnTypeNetworkCapability());

                networkRequestList.get(0).getHighestPriorityApnTypeNetworkCapability());

        logl("Creating data network on "

                + AccessNetworkConstants.transportTypeToString(transport) + " with " + dataProfile

                + ", and attaching " + networkRequestList.size() + " network requests to it.");
@@ -3125,7 +3125,8 @@ public class DataNetworkController extends Handler { 
        log("onDataNetworkSetupRetry: Request list:" + requestList);

        TelephonyNetworkRequest telephonyNetworkRequest = requestList.get(0);



        int networkCapability = telephonyNetworkRequest.getApnTypeNetworkCapability();

        int networkCapability = telephonyNetworkRequest

                .getHighestPriorityApnTypeNetworkCapability();

        int preferredTransport = mAccessNetworksManager.getPreferredTransportByNetworkCapability(

                networkCapability);

        if (preferredTransport != dataSetupRetryEntry.transport) {

src/java/com/android/internal/telephony/data/DataRetryManager.java

+7 −4
Original line number Diff line number Diff line
@@ -1277,7 +1277,8 @@ public class DataRetryManager extends Handler { 
                return;

            }

            for (NetworkRequestList networkRequestList : groupedNetworkRequestLists) {

                int capability = networkRequestList.get(0).getApnTypeNetworkCapability();

                int capability = networkRequestList.get(0)

                        .getHighestPrioritySupportedNetworkCapability();

                if (retryRule.canBeMatched(capability, cause)) {

                    // Check if there is already a similar network request retry scheduled.

                    if (isSimilarNetworkRequestRetryScheduled(
@@ -1492,7 +1493,8 @@ public class DataRetryManager extends Handler { 
                                mPhone.getCarrierId());

                        continue;

                    }

                    if (entry.networkRequestList.get(0).getApnTypeNetworkCapability()

                    if (entry.networkRequestList.get(0)

                            .getHighestPrioritySupportedNetworkCapability()

                            == networkCapability

                            && entry.appliedDataRetryRule.equals(dataRetryRule)) {

                        if (entry.getState() == DataRetryEntry.RETRY_STATE_SUCCEEDED
@@ -1779,8 +1781,9 @@ public class DataRetryManager extends Handler { 
                                mPhone.getCarrierId());

                        continue;

                    }

                    if (entry.networkRequestList.get(0).getApnTypeNetworkCapability()

                            == networkRequest.getApnTypeNetworkCapability()

                    if (entry.networkRequestList.get(0)

                            .getHighestPrioritySupportedNetworkCapability()

                            == networkRequest.getHighestPrioritySupportedNetworkCapability()

                            && entry.transport == transport) {

                        return true;

                    }

src/java/com/android/internal/telephony/data/PhoneSwitcher.java

+2 −14
Original line number Diff line number Diff line
@@ -598,29 +598,17 @@ public class PhoneSwitcher extends Handler { 


        final NetworkCapabilities.Builder builder = new NetworkCapabilities.Builder()

                .addTransportType(NetworkCapabilities.TRANSPORT_CELLULAR)

                .addCapability(NetworkCapabilities.NET_CAPABILITY_MMS)

                .addCapability(NetworkCapabilities.NET_CAPABILITY_SUPL)

                .addCapability(NetworkCapabilities.NET_CAPABILITY_DUN)

                .addCapability(NetworkCapabilities.NET_CAPABILITY_FOTA)

                .addCapability(NetworkCapabilities.NET_CAPABILITY_IMS)

                .addCapability(NetworkCapabilities.NET_CAPABILITY_CBS)

                .addCapability(NetworkCapabilities.NET_CAPABILITY_IA)

                .addCapability(NetworkCapabilities.NET_CAPABILITY_RCS)

                .addCapability(NetworkCapabilities.NET_CAPABILITY_MMTEL)

                .addCapability(NetworkCapabilities.NET_CAPABILITY_XCAP)

                .addCapability(NetworkCapabilities.NET_CAPABILITY_ENTERPRISE)

                .addCapability(NetworkCapabilities.NET_CAPABILITY_EIMS)

                .addCapability(NetworkCapabilities.NET_CAPABILITY_NOT_RESTRICTED)

                .addCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET)

                .addCapability(NetworkCapabilities.NET_CAPABILITY_MCX)

                .addCapability(NetworkCapabilities.NET_CAPABILITY_PRIORITIZE_LATENCY)

                .addCapability(NetworkCapabilities.NET_CAPABILITY_PRIORITIZE_BANDWIDTH)

                .addEnterpriseId(NetworkCapabilities.NET_ENTERPRISE_ID_1)

                .addEnterpriseId(NetworkCapabilities.NET_ENTERPRISE_ID_2)

                .addEnterpriseId(NetworkCapabilities.NET_ENTERPRISE_ID_3)

                .addEnterpriseId(NetworkCapabilities.NET_ENTERPRISE_ID_4)

                .addEnterpriseId(NetworkCapabilities.NET_ENTERPRISE_ID_5)

                .setNetworkSpecifier(new MatchAllNetworkSpecifier());

        TelephonyNetworkRequest.getAllSupportedNetworkCapabilities()

                .forEach(builder::addCapability);



        if (mFlags.satelliteInternet()) {

            // TODO: b/328622096 remove the try/catch

src/java/com/android/internal/telephony/data/TelephonyNetworkFactory.java

+4 −16
Original line number Diff line number Diff line
@@ -138,24 +138,10 @@ public class TelephonyNetworkFactory extends NetworkFactory { 
    public NetworkCapabilities makeNetworkFilter(int subscriptionId) {

        final NetworkCapabilities.Builder builder = new NetworkCapabilities.Builder()

                .addTransportType(NetworkCapabilities.TRANSPORT_CELLULAR)

                .addCapability(NetworkCapabilities.NET_CAPABILITY_MMS)

                .addCapability(NetworkCapabilities.NET_CAPABILITY_SUPL)

                .addCapability(NetworkCapabilities.NET_CAPABILITY_DUN)

                .addCapability(NetworkCapabilities.NET_CAPABILITY_FOTA)

                .addCapability(NetworkCapabilities.NET_CAPABILITY_IMS)

                .addCapability(NetworkCapabilities.NET_CAPABILITY_CBS)

                .addCapability(NetworkCapabilities.NET_CAPABILITY_IA)

                .addCapability(NetworkCapabilities.NET_CAPABILITY_RCS)

                .addCapability(NetworkCapabilities.NET_CAPABILITY_MMTEL)

                .addCapability(NetworkCapabilities.NET_CAPABILITY_XCAP)

                .addCapability(NetworkCapabilities.NET_CAPABILITY_ENTERPRISE)

                .addCapability(NetworkCapabilities.NET_CAPABILITY_EIMS)

                .addCapability(NetworkCapabilities.NET_CAPABILITY_NOT_RESTRICTED)

                .addCapability(NetworkCapabilities.NET_CAPABILITY_NOT_VCN_MANAGED)

                .addCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET)

                .addCapability(NetworkCapabilities.NET_CAPABILITY_MCX)

                .addCapability(NetworkCapabilities.NET_CAPABILITY_PRIORITIZE_LATENCY)

                .addCapability(NetworkCapabilities.NET_CAPABILITY_PRIORITIZE_BANDWIDTH)

                .addEnterpriseId(NetworkCapabilities.NET_ENTERPRISE_ID_1)

                .addEnterpriseId(NetworkCapabilities.NET_ENTERPRISE_ID_2)

                .addEnterpriseId(NetworkCapabilities.NET_ENTERPRISE_ID_3)
@@ -163,6 +149,8 @@ public class TelephonyNetworkFactory extends NetworkFactory { 
                .addEnterpriseId(NetworkCapabilities.NET_ENTERPRISE_ID_5)

                .setNetworkSpecifier(new TelephonyNetworkSpecifier.Builder()

                                .setSubscriptionId(subscriptionId).build());

        TelephonyNetworkRequest.getAllSupportedNetworkCapabilities()

                .forEach(builder::addCapability);



        if (mFlags.satelliteInternet()) {

            // TODO: b/328622096 remove the try/catch
@@ -206,7 +194,7 @@ public class TelephonyNetworkFactory extends NetworkFactory { 


    private int getTransportTypeFromNetworkRequest(TelephonyNetworkRequest networkRequest) {

        int transport = AccessNetworkConstants.TRANSPORT_TYPE_WWAN;

        int capability = networkRequest.getApnTypeNetworkCapability();

        int capability = networkRequest.getHighestPriorityApnTypeNetworkCapability();

        if (capability >= 0) {

            transport = mAccessNetworksManager

                    .getPreferredTransportByNetworkCapability(capability);