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

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

Merge changes from topic "preferred_data_profile" 

* changes:
  Add TEMP_NOT_METERED and CONGESTED support
  Fixed link bandwidth not updated
  Reverse the order of setting data profiles
  Support preferred data profile correctly
  Added data setup/handover throttling support
parents d70881f9 39370548

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

+18 −0
Original line number Diff line number Diff line
@@ -406,6 +406,24 @@ public class AccessNetworksManager extends Handler { 
            }

            bindQualifiedNetworksService();

        }



        if (phone.isUsingNewDataStack()) {

            // Using post to delay the registering because data retry manager instance is created

            // later than access networks manager.

            post(() -> mPhone.getDataNetworkController().getDataRetryManager().registerCallback(

                    new DataRetryManager.DataRetryManagerCallback(this::post) {

                        @Override

                        public void onThrottleStatusChanged(List<ThrottleStatus> throttleStatuses) {

                            try {

                                logl("onThrottleStatusChanged: " + throttleStatuses);

                                mIQualifiedNetworksService.reportThrottleStatusChanged(

                                        mPhone.getPhoneId(), throttleStatuses);

                            } catch (Exception ex) {

                                loge("onThrottleStatusChanged: ", ex);

                            }

                        }

                    }));

        }

    }



    /**

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

+10 −0
Original line number Diff line number Diff line
@@ -40,6 +40,7 @@ import android.telephony.ServiceState; 
import android.telephony.SubscriptionManager;

import android.telephony.TelephonyManager;

import android.telephony.data.ApnSetting;

import android.text.TextUtils;

import android.util.IndentingPrintWriter;



import com.android.internal.R;
@@ -813,6 +814,15 @@ public class DataConfigManager extends Handler { 
            CarrierConfigManager.KEY_DATA_STALL_RECOVERY_SHOULD_SKIP_BOOL_ARRAY);

    }



    /**

     * @return The default preferred APN. An empty string if not configured. This is used for the

     * first time boot up where preferred APN is not set.

     */

    public @NonNull String getDefaultPreferredApn() {

        return TextUtils.emptyIfNull(mCarrierConfig.getString(

                CarrierConfigManager.KEY_DEFAULT_PREFERRED_APN_NAME_STRING));

    }



    /**

     * Registration point for subscription info ready

     *

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

+8 −2
Original line number Diff line number Diff line
@@ -182,7 +182,7 @@ public class DataEvaluation { 
        /** When emergency call started or ended. */

        EMERGENCY_CALL_CHANGED,

        /** When data disconnected, re-evaluate later to see if data could be brought up again. */

        DATA_NETWORK_DISCONNECTED,

        RETRY_AFTER_DISCONNECTED,

        /** Data setup retry. */

        DATA_RETRY,

    }
@@ -223,7 +223,13 @@ public class DataEvaluation { 
        /** Device is currently in an emergency call. */

        EMERGENCY_CALL(true),

        /** There is already a retry setup scheduled for this data profile. */

        RETRY_SCHEDULED(true);

        RETRY_SCHEDULED(true),

        /** Network has explicitly request to throttle setup attempt. */

        DATA_THROTTLED(true),

        /** Data profile becomes invalid. (could be removed by the user, or SIM refresh, etc..) */

        DATA_PROFILE_INVALID(true),

        /** Data profile not preferred (i.e. users switch preferred profile in APN editor.) */

        DATA_PROFILE_NOT_PREFERRED(true);



        private final boolean mIsHardReason;

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

+82 −12
Original line number Diff line number Diff line
@@ -50,6 +50,7 @@ import android.telephony.LinkCapacityEstimate; 
import android.telephony.NetworkRegistrationInfo;

import android.telephony.PreciseDataConnectionState;

import android.telephony.ServiceState;

import android.telephony.SubscriptionPlan;

import android.telephony.TelephonyManager;

import android.telephony.data.ApnSetting;

import android.telephony.data.DataCallResponse;
@@ -172,6 +173,9 @@ public class DataNetwork extends StateMachine { 
    /** Event for setup data call (for handover) response from the data service. */

    private static final int EVENT_HANDOVER_RESPONSE = 15;



    /** Event for subscription plan changed or unmetered/congested override set. */

    private static final int EVENT_SUBSCRIPTION_PLAN_OVERRIDE = 16;



    /** The default MTU for IPv4 network. */

    private static final int DEFAULT_MTU_V4 = 1280;
@@ -602,6 +606,12 @@ public class DataNetwork extends StateMachine { 
        mDataServiceManagers = dataServiceManagers;

        mAccessNetworksManager = phone.getAccessNetworksManager();

        mDataNetworkController = phone.getDataNetworkController();

        mDataNetworkController.registerDataNetworkControllerCallback(

                new DataNetworkController.DataNetworkControllerCallback(getHandler()::post) {

                    @Override

                    public void onSubscriptionPlanOverride() {

                        sendMessage(EVENT_SUBSCRIPTION_PLAN_OVERRIDE);

                    }});

        mDataConfigManager = mDataNetworkController.getDataConfigManager();

        mDataNetworkCallback = callback;

        mDataProfile = dataProfile;
@@ -926,6 +936,9 @@ public class DataNetwork extends StateMachine { 
                case EVENT_START_HANDOVER:

                    onStartHandover(msg.arg1, (DataHandoverRetryEntry) msg.obj);

                    break;

                case EVENT_SUBSCRIPTION_PLAN_OVERRIDE:

                    updateMeteredAndCongested();

                    break;

                default:

                    return NOT_HANDLED;

            }
@@ -1082,9 +1095,11 @@ public class DataNetwork extends StateMachine { 
    private void registerForBandwidthUpdate() {

        int bandwidthEstimateSource = mDataConfigManager.getBandwidthEstimateSource();

        if (bandwidthEstimateSource == BANDWIDTH_SOURCE_MODEM) {

            mPhone.mCi.unregisterForLceInfo(getHandler());

            mPhone.mCi.registerForLceInfo(

                    getHandler(), EVENT_BANDWIDTH_ESTIMATE_FROM_MODEM_CHANGED, null);

        } else if (bandwidthEstimateSource == BANDWIDTH_SOURCE_BANDWIDTH_ESTIMATOR) {

            mPhone.getLinkBandwidthEstimator().unregisterForBandwidthChanged(getHandler());

            mPhone.getLinkBandwidthEstimator().registerForBandwidthChanged(

                    getHandler(), EVENT_BANDWIDTH_ESTIMATE_FROM_BANDWIDTH_ESTIMATOR_CHANGED, null);

        } else {

            loge("Invalid bandwidth source configuration: " + bandwidthEstimateSource);

        }
@@ -1136,12 +1151,10 @@ public class DataNetwork extends StateMachine { 
            builder.addCapability(NetworkCapabilities.NET_CAPABILITY_NOT_METERED);

        }

        // TODO: Support NET_CAPABILITY_NOT_RESTRICTED

        // TODO: Support NET_CAPABILITY_NOT_CONGESTED correctly

        if (!mCongested) {

            builder.addCapability(NetworkCapabilities.NET_CAPABILITY_NOT_CONGESTED);

        }



        // TODO: Support NET_CAPABILITY_TEMPORARILY_NOT_METERED correctly

        if (mTempNotMeteredSupported && mTempNotMetered) {

            builder.addCapability(NetworkCapabilities.NET_CAPABILITY_TEMPORARILY_NOT_METERED);

        }
@@ -1760,9 +1773,66 @@ public class DataNetwork extends StateMachine { 
     * Update the metered and congested values from carrier configs and subscription overrides

     */

    private void updateMeteredAndCongested() {

        log("updateMeteredAndCongested");

        mTempNotMeteredSupported = mDataConfigManager.isTempNotMeteredSupportedByCarrier();

        // TODO: set mTempNotMetered and mCongested based on SubscriptionPlans and overrides

        int networkType = isNrConnected() ? TelephonyManager.NETWORK_TYPE_NR : getDataNetworkType();

        log("updateMeteredAndCongested: networkType="

                + TelephonyManager.getNetworkTypeName(networkType));

        boolean changed = false;

        if (mDataConfigManager.isTempNotMeteredSupportedByCarrier() != mTempNotMeteredSupported) {

            mTempNotMeteredSupported = !mTempNotMeteredSupported;

            changed = true;

            log("updateMeteredAndCongested: mTempNotMeteredSupported changed to "

                    + mTempNotMeteredSupported);

        }

        if ((mDataNetworkController.getUnmeteredOverrideNetworkTypes().contains(networkType)

                || isNetworkTypeUnmetered(networkType)) != mTempNotMetered) {

            mTempNotMetered = !mTempNotMetered;

            changed = true;

            log("updateMeteredAndCongested: mTempNotMetered changed to " + mTempNotMetered);

        }

        if (mDataNetworkController.getCongestedOverrideNetworkTypes().contains(networkType)

                != mCongested) {

            mCongested = !mCongested;

            changed = true;

            log("updateMeteredAndCongested: mCongested changed to " + mCongested);

        }

        if (changed) {

            updateNetworkCapabilities();

        }

    }



    /**

     * Get whether the network type is unmetered from SubscriptionPlans, from either an unmetered

     * general plan or specific plan for the given network type.

     *

     * @param networkType The network type to check meteredness for

     * @return Whether the given network type is unmetered based on SubscriptionPlans

     */

    private boolean isNetworkTypeUnmetered(@NetworkType int networkType) {

        List<SubscriptionPlan> plans = mDataNetworkController.getSubscriptionPlans();

        if (plans.isEmpty()) return false;

        boolean isGeneralUnmetered = true;

        Set<Integer> allNetworkTypes = Arrays.stream(TelephonyManager.getAllNetworkTypes())

                .boxed().collect(Collectors.toSet());

        for (SubscriptionPlan plan : plans) {

            // Check if plan is general (applies to all network types) or specific

            if (Arrays.stream(plan.getNetworkTypes()).boxed().collect(Collectors.toSet())

                    .containsAll(allNetworkTypes)) {

                if (plan.getDataLimitBytes() != SubscriptionPlan.BYTES_UNLIMITED) {

                    // Metered takes precedence over unmetered for safety

                    isGeneralUnmetered = false;

                }

            } else {

                // Check if plan applies to given network type

                if (networkType != TelephonyManager.NETWORK_TYPE_UNKNOWN) {

                    for (int planNetworkType : plan.getNetworkTypes()) {

                        if (planNetworkType == networkType) {

                            return plan.getDataLimitBytes() == SubscriptionPlan.BYTES_UNLIMITED;

                        }

                    }

                }

            }

        }

        return isGeneralUnmetered;

    }



    /**
@@ -1880,7 +1950,7 @@ public class DataNetwork extends StateMachine { 
    /**

     * @return {@code true} if in handover state.

     */

    public boolean isUnderHandover() {

    public boolean isHandoverInProgress() {

        return getCurrentState() == mHandoverState;

    }
@@ -1912,7 +1982,7 @@ public class DataNetwork extends StateMachine { 
            return TelephonyManager.DATA_CONNECTED;

        } else if (isDisconnecting()) {

            return TelephonyManager.DATA_DISCONNECTING;

        } else if (isUnderHandover()) {

        } else if (isHandoverInProgress()) {

            return TelephonyManager.DATA_HANDOVER_IN_PROGRESS;

        }
@@ -2039,9 +2109,7 @@ public class DataNetwork extends StateMachine { 
            mDataServiceManagers.get(mTransport).deactivateDataCall(mCid.get(mTransport),

                    DataService.REQUEST_REASON_HANDOVER, null);

            // Switch the transport to the target.

            mTransport = mTransport == AccessNetworkConstants.TRANSPORT_TYPE_WWAN

                    ? AccessNetworkConstants.TRANSPORT_TYPE_WLAN

                    : AccessNetworkConstants.TRANSPORT_TYPE_WWAN;

            mTransport = DataUtils.getTargetTransport(mTransport);

            updateDataNetwork(response);

            if (retryEntry != null) retryEntry.setState(DataRetryEntry.RETRY_STATE_SUCCEEDED);

            mDataNetworkCallback.invokeFromExecutor(
@@ -2137,6 +2205,8 @@ public class DataNetwork extends StateMachine { 
                return "EVENT_START_HANDOVER";

            case EVENT_HANDOVER_RESPONSE:

                return "EVENT_HANDOVER_RESPONSE";

            case EVENT_SUBSCRIPTION_PLAN_OVERRIDE:

                return "EVENT_SUBSCRIPTION_PLAN_OVERRIDE";

            default:

                return "Unknown(" + event + ")";

        }

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

+207 −31

File changed.

Preview size limit exceeded, changes collapsed.