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

Commit 15d84436 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge changes from topics "srvcc", "unmetered_configs" 

* changes:
  Use new carrier configs for unmetered network types
  Delay IMS teardown during SRVCC handover
parents d8463463 15023be9

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

+2 −0
Original line number Diff line number Diff line
@@ -230,6 +230,8 @@ public class DataEvaluation { 
        PREFERRED_TRANSPORT_CHANGED(true),

        /** Slice config changed. */

        SLICE_CONFIG_CHANGED(true),

        /** SRVCC state changed. */

        SRVCC_STATE_CHANGED(true),

        /**

         * Single data network arbitration. On certain RATs, only one data network is allowed at the

         * same time.

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

+7 −15
Original line number Diff line number Diff line
@@ -1338,17 +1338,6 @@ public class DataNetwork extends StateMachine { 
                    }



                    int tearDownReason = msg.arg1;

                    // If the tear down request is from upper layer, for example, IMS service

                    // releases network request, we don't need to delay. The purpose of the delay

                    // is to have IMS service have time to perform IMS de-registration, so if this

                    // request is from IMS service itself, that means IMS service is already aware

                    // of the tear down. So there is no need to delay in this case.

                    if (tearDownReason != TEAR_DOWN_REASON_CONNECTIVITY_SERVICE_UNWANTED

                            && shouldDelayImsTearDown()) {

                        logl("Delay IMS tear down until call ends. reason="

                                + tearDownReasonToString(tearDownReason));

                        break;

                    }



                    removeMessages(EVENT_TEAR_DOWN_NETWORK);

                    removeDeferredMessages(EVENT_TEAR_DOWN_NETWORK);
@@ -2608,7 +2597,7 @@ public class DataNetwork extends StateMachine { 
     * @return {@code true} if this is an IMS network and tear down should be delayed until call

     * ends on this data network.

     */

    public boolean shouldDelayImsTearDown() {

    public boolean shouldDelayImsTearDownDueToInCall() {

        return mDataConfigManager.isImsDelayTearDownEnabled()

                && mNetworkCapabilities != null

                && mNetworkCapabilities.hasCapability(NetworkCapabilities.NET_CAPABILITY_MMTEL)
@@ -2832,9 +2821,12 @@ public class DataNetwork extends StateMachine { 
            log("updateMeteredAndCongested: mTempNotMeteredSupported changed to "

                    + mTempNotMeteredSupported);

        }

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

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

            mTempNotMetered = !mTempNotMetered;

        boolean isTempNotMetered = mDataConfigManager.isNetworkTypeUnmetered(

                mTelephonyDisplayInfo, mPhone.getServiceState())

                && (mDataNetworkController.getUnmeteredOverrideNetworkTypes().contains(networkType)

                || isNetworkTypeUnmetered(networkType));

        if (isTempNotMetered != mTempNotMetered) {

            mTempNotMetered = isTempNotMetered;

            changed = true;

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

        }

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

+42 −4
Original line number Diff line number Diff line
@@ -141,6 +141,9 @@ public class DataNetworkController extends Handler { 
    /** Event for removing a network request. */

    private static final int EVENT_REMOVE_NETWORK_REQUEST = 3;



    /** Event for SRVCC state changed. */

    private static final int EVENT_SRVCC_STATE_CHANGED = 4;



    /** Re-evaluate all unsatisfied network requests. */

    private static final int EVENT_REEVALUATE_UNSATISFIED_NETWORK_REQUESTS = 5;
@@ -311,6 +314,9 @@ public class DataNetworkController extends Handler { 
    /** Indicates if NR advanced is allowed by PCO. */

    private boolean mNrAdvancedCapableByPco = false;



    /** Indicates if srvcc is going on. */

    private boolean mIsSrvccHandoverInProcess = false;



    /**

     * Indicates if the data services are bound. Key if the transport type, and value is the boolean

     * indicating service is bound or not.
@@ -910,7 +916,7 @@ public class DataNetworkController extends Handler { 
                                            preferredTransport));

                            return;

                        }

                        if (dataNetwork.shouldDelayImsTearDown()) {

                        if (dataNetwork.shouldDelayImsTearDownDueToInCall()) {

                            log("onDataNetworkHandoverRetryStopped: Delay IMS tear down until call "

                                    + "ends. " + dataNetwork);

                            return;
@@ -1025,6 +1031,7 @@ public class DataNetworkController extends Handler { 
                    this, EVENT_VOICE_CALL_ENDED, null);

        }

        mPhone.mCi.registerForSlicingConfigChanged(this, EVENT_SLICE_CONFIG_CHANGED, null);

        mPhone.mCi.registerForSrvccStateChanged(this, EVENT_SRVCC_STATE_CHANGED, null);



        mPhone.getLinkBandwidthEstimator().registerCallback(

                new LinkBandwidthEstimatorCallback(this::post) {
@@ -1038,6 +1045,7 @@ public class DataNetworkController extends Handler { 


    @Override

    public void handleMessage(@NonNull Message msg) {

        AsyncResult ar;

        switch (msg.what) {

            case EVENT_REGISTER_ALL_EVENTS:

                onRegisterAllEvents();
@@ -1072,6 +1080,12 @@ public class DataNetworkController extends Handler { 
                sendMessage(obtainMessage(EVENT_REEVALUATE_UNSATISFIED_NETWORK_REQUESTS,

                        DataEvaluationReason.SLICE_CONFIG_CHANGED));

                break;

            case EVENT_SRVCC_STATE_CHANGED:

                ar = (AsyncResult) msg.obj;

                if (ar.exception == null) {

                    onSrvccStateChanged((int[]) ar.result);

                }

                break;

            case EVENT_PS_RESTRICT_ENABLED:

                mPsRestricted = true;

                break;
@@ -1088,7 +1102,7 @@ public class DataNetworkController extends Handler { 
                        REEVALUATE_UNSATISFIED_NETWORK_REQUESTS_TAC_CHANGED_DELAY_MILLIS);

                break;

            case EVENT_DATA_SERVICE_BINDING_CHANGED:

                AsyncResult ar = (AsyncResult) msg.obj;

                ar = (AsyncResult) msg.obj;

                int transport = (int) ar.userObj;

                boolean bound = (boolean) ar.result;

                onDataServiceBindingChanged(transport, bound);
@@ -1750,13 +1764,15 @@ public class DataNetworkController extends Handler { 
            }

        }



        boolean isMmtel = false;

        // If the data network is IMS that supports voice call, and has MMTEL request (client

        // specified VoPS is required.)

        if (dataNetwork.getAttachedNetworkRequestList().get(

                new int[]{NetworkCapabilities.NET_CAPABILITY_MMTEL}) != null) {

            // When reaching here, it means the network supports MMTEL, and also has MMTEL request

            // attached to it.

            if (!dataNetwork.shouldDelayImsTearDown()) {

            isMmtel = true;

            if (!dataNetwork.shouldDelayImsTearDownDueToInCall()) {

                if (dataNetwork.getTransport() == AccessNetworkConstants.TRANSPORT_TYPE_WWAN) {

                    NetworkRegistrationInfo nri = mServiceState.getNetworkRegistrationInfo(

                            NetworkRegistrationInfo.DOMAIN_PS,
@@ -1803,7 +1819,9 @@ public class DataNetworkController extends Handler { 
            // Sometimes network temporarily OOS and network type becomes UNKNOWN. We don't

            // tear down network in that case.

            if (networkType != TelephonyManager.NETWORK_TYPE_UNKNOWN

                    && !dataProfile.getApnSetting().canSupportLingeringNetworkType(networkType)) {

                    && !dataProfile.getApnSetting().canSupportLingeringNetworkType(networkType)

                    // delay IMS tear down if SRVCC in progress

                    && !(isMmtel && mIsSrvccHandoverInProcess)) {

                log("networkType=" + TelephonyManager.getNetworkTypeName(networkType)

                        + ", networkTypeBitmask="

                        + TelephonyManager.convertNetworkTypeBitmaskToString(
@@ -3004,6 +3022,25 @@ public class DataNetworkController extends Handler { 
                        DataNetwork.TEAR_DOWN_REASON_DATA_STALL));

    }



    /**

     * Called when SRVCC handover state changes. To preserve the voice call, we don't tear down the

     * IMS network while handover in process. We reevaluate the network when handover ends.

     *

     * @param state The handover state of SRVCC

     */

    private void onSrvccStateChanged(@NonNull int[] state) {

        if (state != null && state.length != 0) {

            log("onSrvccStateChanged: " + TelephonyManager.srvccStateToString(state[0]));

            mIsSrvccHandoverInProcess = state[0] == TelephonyManager.SRVCC_STATE_HANDOVER_STARTED;

            // Reevaluate networks if SRVCC ends.

            if (!mIsSrvccHandoverInProcess

                    && !hasMessages(EVENT_REEVALUATE_EXISTING_DATA_NETWORKS)) {

                sendMessage(obtainMessage(EVENT_REEVALUATE_EXISTING_DATA_NETWORKS,

                        DataEvaluationReason.SRVCC_STATE_CHANGED));

            }

        }

    }



    /**

     * Called when data service binding changed.

     *
@@ -3756,6 +3793,7 @@ public class DataNetworkController extends Handler { 
        pw.println("mImsDataNetworkState="

                + TelephonyUtils.dataStateToString(mImsDataNetworkState));

        pw.println("mDataServiceBound=" + mDataServiceBound);

        pw.println("mIsSrvccHandoverInProcess=" + mIsSrvccHandoverInProcess);

        pw.println("mSimState=" + TelephonyManager.simStateToString(mSimState));

        pw.println("mDataNetworkControllerCallbacks=" + mDataNetworkControllerCallbacks);

        pw.println("Subscription plans:");

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

+29 −0
Original line number Diff line number Diff line
@@ -665,6 +665,8 @@ public class DataNetworkControllerTest extends TelephonyTest { 


        mCarrierConfig.putBoolean(CarrierConfigManager.KEY_NETWORK_TEMP_NOT_METERED_SUPPORTED_BOOL,

                true);

        mCarrierConfig.putStringArray(CarrierConfigManager.KEY_UNMETERED_NETWORK_TYPES_STRING_ARRAY,

                new String[] {"NR_NSA", "NR_NSA_MMWAVE", "NR_SA", "NR_SA_MMWAVE"});



        mCarrierConfig.putIntArray(CarrierConfigManager.KEY_ONLY_SINGLE_DC_ALLOWED_INT_ARRAY,

                new int[]{TelephonyManager.NETWORK_TYPE_CDMA, TelephonyManager.NETWORK_TYPE_1xRTT,
@@ -3198,6 +3200,33 @@ public class DataNetworkControllerTest extends TelephonyTest { 
        verifyAllDataDisconnected();

    }



    @Test

    public void testDelayImsTearDownDuringSrvcc() throws Exception {

        testSetupImsDataNetwork();

        // SRVCC in progress, delay tear down

        mDataNetworkControllerUT.obtainMessage(4 /*EVENT_SRVCC_STATE_CHANGED*/,

                new AsyncResult(null,

                        new int[]{TelephonyManager.SRVCC_STATE_HANDOVER_STARTED}, null))

                .sendToTarget();

        serviceStateChanged(TelephonyManager.NETWORK_TYPE_HSPAP,

                NetworkRegistrationInfo.REGISTRATION_STATE_HOME);

        processAllMessages();



        // Make sure IMS network is still connected.

        verifyConnectedNetworkHasCapabilities(NetworkCapabilities.NET_CAPABILITY_IMS,

                NetworkCapabilities.NET_CAPABILITY_MMTEL);



        // SRVCC handover ends, tear down as normal

        mDataNetworkControllerUT.obtainMessage(4 /*EVENT_SRVCC_STATE_CHANGED*/,

                        new AsyncResult(null,

                                new int[]{TelephonyManager.SRVCC_STATE_HANDOVER_CANCELED}, null))

                .sendToTarget();

        processAllFutureMessages();



        // Make sure IMS network is torn down

        verifyNoConnectedNetworkHasCapability(NetworkCapabilities.NET_CAPABILITY_MMTEL);

    }



    @Test

    public void testUnmeteredMmsWhenDataDisabled() throws Exception {

        mCarrierConfig.putStringArray(

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

+2 −0
Original line number Diff line number Diff line
@@ -338,6 +338,8 @@ public class DataNetworkTest extends TelephonyTest { 
        doReturn(DataNetwork.BANDWIDTH_SOURCE_BANDWIDTH_ESTIMATOR)

                .when(mDataConfigManager).getBandwidthEstimateSource();

        doReturn(true).when(mDataConfigManager).isTempNotMeteredSupportedByCarrier();

        doReturn(true).when(mDataConfigManager).isNetworkTypeUnmetered(

                any(TelephonyDisplayInfo.class), any(ServiceState.class));

        doReturn(true).when(mDataConfigManager).isImsDelayTearDownEnabled();

        doReturn(DEFAULT_MTU).when(mDataConfigManager).getDefaultMtu();

        doReturn(FAKE_IMSI).when(mPhone).getSubscriberId();