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

Commit 66cf77fa authored by Jack Yu's avatar Jack Yu
Browse files

Reevaluate unsatisfied network requests when TAC changes 

When TAC changes, we should re-evaluate the unsatisfied network
requests to see if data can be setup again.

Fix: 228944347
Test: atest DataNetworkControllerTest

Change-Id: I7c07b4c5bb686563da56c3e6f912064e4d3a0b35
parent 3c8a478a

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

+2 −0
Original line number Diff line number Diff line
@@ -224,6 +224,8 @@ public class DataEvaluation { 
        SINGLE_DATA_NETWORK_ARBITRATION,

        /** Query from {@link TelephonyManager#isDataConnectivityPossible()}. */

        EXTERNAL_QUERY,

        /** Tracking area code changed. */

        TAC_CHANGED,

    }



    /** Disallowed reasons. There could be multiple reasons if it is not allowed. */

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

+14 −6
Original line number Diff line number Diff line
@@ -194,6 +194,9 @@ public class DataNetworkController extends Handler { 
    /** Event for slice config changed. */

    private static final int EVENT_SLICE_CONFIG_CHANGED = 24;



    /** Event for tracking area code changed. */

    private static final int EVENT_TAC_CHANGED = 25;



    /** The supported IMS features. This is for IMS graceful tear down support. */

    private static final Collection<Integer> SUPPORTED_IMS_FEATURES =

            List.of(ImsFeature.FEATURE_MMTEL, ImsFeature.FEATURE_RCS);
@@ -212,12 +215,9 @@ public class DataNetworkController extends Handler { 
    private static final long REEVALUATE_UNSATISFIED_NETWORK_REQUESTS_AFTER_CALL_END_DELAY_MILLIS =

            TimeUnit.MILLISECONDS.toMillis(500);



    /**

     * The maximum number of occurrences within a time window defined by

     * {@link DataConfigManager#getImsRequestReleaseThrottleAnomalyWindowMs}

     * for duplicate release-request for IMS, the violation of which triggers anomaly report.

     */

    private static final int IMS_REQUEST_RELEASE_THROTTLE_ANOMALY_NUM_OCCURRENCES = 2;

    /** The delay in milliseconds to re-evaluate unsatisfied network requests after TAC changes. */

    private static final long REEVALUATE_UNSATISFIED_NETWORK_REQUESTS_TAC_CHANGED_DELAY_MILLIS =

            TimeUnit.MILLISECONDS.toMillis(100);



    private final Phone mPhone;

    private final String mLogTag;
@@ -961,6 +961,7 @@ public class DataNetworkController extends Handler { 
                EVENT_PS_RESTRICT_ENABLED, null);

        mPhone.getServiceStateTracker().registerForPsRestrictedDisabled(this,

                EVENT_PS_RESTRICT_DISABLED, null);

        mPhone.getServiceStateTracker().registerForAreaCodeChanged(this, EVENT_TAC_CHANGED, null);

        mPhone.registerForEmergencyCallToggle(this, EVENT_EMERGENCY_CALL_CHANGED, null);

        mDataServiceManagers.get(AccessNetworkConstants.TRANSPORT_TYPE_WWAN)

                .registerForServiceBindingChanged(this, EVENT_DATA_SERVICE_BINDING_CHANGED);
@@ -1043,6 +1044,13 @@ public class DataNetworkController extends Handler { 
                sendMessage(obtainMessage(EVENT_REEVALUATE_UNSATISFIED_NETWORK_REQUESTS,

                        DataEvaluationReason.DATA_RESTRICTED_CHANGED));

                break;

            case EVENT_TAC_CHANGED:

                // Re-evaluate unsatisfied network requests with some delays to let DataRetryManager

                // clears the throttling record.

                sendMessageDelayed(obtainMessage(EVENT_REEVALUATE_UNSATISFIED_NETWORK_REQUESTS,

                        DataEvaluationReason.TAC_CHANGED),

                        REEVALUATE_UNSATISFIED_NETWORK_REQUESTS_TAC_CHANGED_DELAY_MILLIS);

                break;

            case EVENT_DATA_SERVICE_BINDING_CHANGED:

                AsyncResult ar = (AsyncResult) msg.obj;

                int transport = (int) ar.userObj;

tests/telephonytests/src/com/android/internal/telephony/data/DataNetworkControllerTest.java

+20 −0
Original line number Diff line number Diff line
@@ -1905,6 +1905,26 @@ public class DataNetworkControllerTest extends TelephonyTest { 
                .isEqualTo(AccessNetworkConstants.TRANSPORT_TYPE_WWAN);

    }



    @Test

    public void testTacChangesClearThrottlingAndRetryHappens() throws Exception {

        testSetupDataNetworkNetworkSuggestedRetryTimerDataThrottled();

        processAllFutureMessages();



        setSuccessfulSetupDataResponse(mMockedWwanDataServiceManager, 1);

        logd("Sending TAC_CHANGED event");

        mDataNetworkControllerUT.obtainMessage(25/*EVENT_TAC_CHANGED*/).sendToTarget();

        mDataNetworkControllerUT.getDataRetryManager().obtainMessage(10/*EVENT_TAC_CHANGED*/)

                .sendToTarget();

        processAllFutureMessages();



        // TAC changes should clear the already-scheduled retry and throttling.

        assertThat(mDataNetworkControllerUT.getDataRetryManager().isAnySetupRetryScheduled(

                mImsDataProfile, AccessNetworkConstants.TRANSPORT_TYPE_WWAN)).isFalse();



        // But DNC should re-evaluate unsatisfied request and setup IMS again.

        verifyConnectedNetworkHasCapabilities(NetworkCapabilities.NET_CAPABILITY_IMS);

    }



    @Test

    public void testNrAdvancedByPco() throws Exception {

        testSetupDataNetwork();