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

Commit 60f2c50b authored by Jack Yu's avatar Jack Yu Committed by Android (Google) Code Review
Browse files

Merge changes from topic "data_retry" 

* changes:
  Forward events to data stall recovery manager
  Added data retry support
parents d628f7ae bc3f4b0c

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

+2 −1
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ import android.os.Looper; 
import android.os.Message;

import android.os.PersistableBundle;

import android.os.RegistrantList;

import android.telephony.Annotation.NetCapability;

import android.telephony.Annotation.NetworkType;

import android.telephony.CarrierConfigManager;

import android.telephony.SubscriptionManager;
@@ -185,7 +186,7 @@ public class DataConfigManager extends Handler { 
     * @param capability The network capability

     * @return The priority range from 0 ~ 100. 100 is the highest priority.

     */

    public int getNetworkCapabilityPriority(int capability) {

    public int getNetworkCapabilityPriority(@NetCapability int capability) {

        if (mNetworkCapabilityPriorityMap.containsKey(capability)) {

            return mNetworkCapabilityPriorityMap.get(capability);

        }

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

+1 −7
Original line number Diff line number Diff line
@@ -21,9 +21,7 @@ import android.annotation.NonNull; 
import android.annotation.Nullable;

import android.telephony.data.DataProfile;



import java.text.SimpleDateFormat;

import java.util.HashSet;

import java.util.Locale;

import java.util.Set;



/**
@@ -31,10 +29,6 @@ import java.util.Set; 
 * establishing a data network.

 */

public class DataEvaluation {

    /** For time stamp formatting in debug message use only. */

    private static final SimpleDateFormat TIME_FORMAT =

            new SimpleDateFormat("MM-dd HH:mm:ss.SSS", Locale.US);



    /** The reason for this evaluation */

    private final DataEvaluationReason mDataEvaluationReason;
@@ -279,7 +273,7 @@ public class DataEvaluation { 
            evaluationStr.append(" ").append(mDataAllowedReason);

        }

        evaluationStr.append(", candidate profile=" + mCandidateDataProfile);

        evaluationStr.append(", time=" + TIME_FORMAT.format(mEvaluatedTime));

        evaluationStr.append(", time=" + DataUtils.getReadableSystemTime(mEvaluatedTime));

        return evaluationStr.toString();

    }

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

+25 −5
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ import android.net.Uri; 
import android.os.AsyncResult;

import android.os.Looper;

import android.os.Message;

import android.os.SystemClock;

import android.telephony.AccessNetworkConstants;

import android.telephony.AccessNetworkConstants.AccessNetworkType;

import android.telephony.AccessNetworkConstants.TransportType;
@@ -162,7 +163,6 @@ public class DataNetwork extends StateMachine { 
    private static final int DEFAULT_INTERNET_NETWORK_SCORE = 50;

    private static final int OTHER_NETWORK_SCORE = 45;



    /** @hide */

    @IntDef(prefix = {"DEACTIVATION_REASON_"},

            value = {

                    TEAR_DOWN_REASON_CONNECTIVITY_SERVICE_UNWANTED,
@@ -297,6 +297,7 @@ public class DataNetwork extends StateMachine { 
         * Called when data setup failed.

         *

         * @param dataNetwork The data network.

         * @param requestList The network requests attached to this data network.

         * @param cause The fail cause of setup data network.

         * @param retryDurationMillis The network suggested data retry duration in milliseconds as

         * specified in 3GPP TS 24.302 section 8.2.9.1. The {@link DataProfile} associated to this
@@ -305,7 +306,8 @@ public class DataNetwork extends StateMachine { 
         * data retry should not occur. {@link DataCallResponse#RETRY_DURATION_UNDEFINED} indicates

         * network did not suggest any retry duration.

         */

        void onSetupDataFailed(@NonNull DataNetwork dataNetwork, @DataFailureCause int cause,

        void onSetupDataFailed(@NonNull DataNetwork dataNetwork,

                @NonNull NetworkRequestList requestList, @DataFailureCause int cause,

                long retryDurationMillis);



        /**
@@ -429,6 +431,7 @@ public class DataNetwork extends StateMachine { 
        mDataConfigManager = mDataNetworkController.getDataConfigManager();

        mDataNetworkCallback = callback;

        mDataProfile = dataProfile;

        dataProfile.setLastSetupTimestamp(SystemClock.elapsedRealtime());

        mAttachedNetworkRequestList.addAll(networkRequestList);

        mCid.put(AccessNetworkConstants.TRANSPORT_TYPE_WWAN, INVALID_CID);

        mCid.put(AccessNetworkConstants.TRANSPORT_TYPE_WLAN, INVALID_CID);
@@ -907,8 +910,8 @@ public class DataNetwork extends StateMachine { 
        // Get the highest priority network request.

        TelephonyNetworkRequest networkRequest = mAttachedNetworkRequestList.get(0);



        mPreferredTransport = mDataNetworkController

                .getPreferredTransportTypeForNetworkRequest(networkRequest);

        mPreferredTransport = mAccessNetworksManager.getPreferredTransportByNetworkCapability(

                networkRequest.getHighestPriorityNetworkCapability());

        if (mTransport == AccessNetworkConstants.TRANSPORT_TYPE_INVALID) {

            mTransport = mPreferredTransport;

        }
@@ -1232,8 +1235,10 @@ public class DataNetwork extends StateMachine { 
            // Setup data failed.

            long retry = response != null ? response.getRetryDurationMillis()

                    : DataCallResponse.RETRY_DURATION_UNDEFINED;

            NetworkRequestList requestList = new NetworkRequestList(mAttachedNetworkRequestList);

            detachAllNetworkRequests();

            mDataNetworkCallback.onSetupDataFailed(DataNetwork.this, failCause, retry);

            mDataNetworkCallback.onSetupDataFailed(DataNetwork.this, requestList,

                    failCause, retry);

            transitionTo(mDisconnectedState);

        }

    }
@@ -1433,6 +1438,21 @@ public class DataNetwork extends StateMachine { 
        return TelephonyManager.DATA_UNKNOWN;

    }



    /**

     * @return {@code true} if this data network supports internet.

     */

    public boolean isInternet() {

        return mNetworkCapabilities.hasCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET)

                && mNetworkCapabilities.hasCapability(

                        NetworkCapabilities.NET_CAPABILITY_NOT_RESTRICTED)

                && mNetworkCapabilities.hasCapability(

                        NetworkCapabilities.NET_CAPABILITY_TRUSTED)

                && mNetworkCapabilities.hasCapability(

                        NetworkCapabilities.NET_CAPABILITY_NOT_VCN_MANAGED)

                && mNetworkCapabilities.hasCapability(

                        NetworkCapabilities.NET_CAPABILITY_NOT_VPN);

    }



    /**

     * Get precise data connection state

     *

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

+159 −87

File changed.

Preview size limit exceeded, changes collapsed.

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

+31 −4
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ import android.os.Message; 
import android.os.RegistrantList;

import android.provider.Telephony;

import android.telephony.Annotation;

import android.telephony.Annotation.NetCapability;

import android.telephony.NetworkRegistrationInfo;

import android.telephony.SubscriptionManager;

import android.telephony.TelephonyManager;
@@ -36,6 +37,7 @@ import android.util.IndentingPrintWriter; 
import android.util.LocalLog;



import com.android.internal.telephony.Phone;

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

import com.android.telephony.Rlog;



import java.io.FileDescriptor;
@@ -57,10 +59,18 @@ public class DataProfileManager extends Handler { 
    private final String mLogTag;

    private final LocalLog mLocalLog = new LocalLog(128);



    /** Data network controller. */

    private final @NonNull DataNetworkController mDataNetworkController;



    /** Data config manager. */

    private final @NonNull DataConfigManager mDataConfigManager;



    /** Cellular data service. */

    private final @NonNull DataServiceManager mWwanDataServiceManager;



    /** Access networks manager. */

    private final @NonNull AccessNetworksManager mAccessNetworksManager;



    /** All data profiles for the current carrier. */

    private final @NonNull List<DataProfile> mAllDataProfiles = new ArrayList<>();
@@ -94,7 +104,7 @@ public class DataProfileManager extends Handler { 
        mDataNetworkController = dataNetworkController;

        mWwanDataServiceManager = dataServiceManager;

        mDataConfigManager = dataNetworkController.getDataConfigManager();



        mAccessNetworksManager = phone.getAccessNetworksManager();



        mDataConfigManager.registerForConfigUpdate(this, EVENT_DATA_CONFIG_UPDATED);

    }
@@ -335,8 +345,8 @@ public class DataProfileManager extends Handler { 
        }



        // Step 3: Check if the remaining data profiles can used in current data RAT.

        int transport = mDataNetworkController

                .getPreferredTransportTypeForNetworkRequest(networkRequest);

        int transport = mAccessNetworksManager.getPreferredTransportByNetworkCapability(

                networkRequest.getHighestPriorityNetworkCapability());

        NetworkRegistrationInfo nri = mPhone.getServiceState().getNetworkRegistrationInfo(

                NetworkRegistrationInfo.DOMAIN_PS, transport);

        int dataRat = nri.getAccessNetworkTechnology();
@@ -372,6 +382,21 @@ public class DataProfileManager extends Handler { 
        return dataProfiles.get(0);

    }



    /**

     * Get data profiles that can satisfy given network capabilities.

     *

     * @param networkCapabilities The network capabilities.

     * @return data profiles that can satisfy given network capabilities.

     */

    public @NonNull List<DataProfile> getDataProfilesForNetworkCapabilities(

            @NonNull @NetCapability int[] networkCapabilities) {

        return mAllDataProfiles.stream()

                .filter(dp -> dp.canSatisfy(networkCapabilities))

                .sorted((dp1, dp2) ->

                        Long.compare(dp1.getLastSetupTimestamp(), dp2.getLastSetupTimestamp()))

                .collect(Collectors.toList());

    }



    /**

     * Register for data profiles changed changed event.

     *
@@ -422,7 +447,9 @@ public class DataProfileManager extends Handler { 
        pw.println("Data profiles for the current carrier:");

        pw.increaseIndent();

        for (DataProfile dp : mAllDataProfiles) {

            pw.println(dp);

            pw.print(dp);

            pw.print(", last setup time: " + DataUtils.elapsedTimeToString(

                    dp.getLastSetupTimestamp()));

        }

        pw.decreaseIndent();

        pw.println("Preferred data profile:");