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

Commit b8d54c7d authored by Ling Ma's avatar Ling Ma Committed by Automerger Merge Worker
Browse files

Exempt IMS from single PDN arbitration am: 470bdccc 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/17772830



Change-Id: I4280dee8046a4a5bef5508f717e9caf660474e4f
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 5edd456a 470bdccc

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

+15 −5
Original line number Diff line number Diff line
@@ -1155,6 +1155,7 @@ public class DataNetworkController extends Handler { 
     * @param networkRequest The network request.

     */

    private void onAddNetworkRequest(@NonNull TelephonyNetworkRequest networkRequest) {

        // To detect IMS back-to-back release-request anomaly event

        if (mLastImsOperationIsRelease) {

            mLastImsOperationIsRelease = false;

            if (Arrays.equals(
@@ -1454,10 +1455,17 @@ public class DataNetworkController extends Handler { 
        }



        // Check if only one data network is allowed.

        if (isOnlySingleDataNetworkAllowed(transport) && !mDataNetworkList.isEmpty()) {

        // Note any IMS network is ignored for the single-connection rule.

        if (isOnlySingleDataNetworkAllowed(transport)

                && !networkRequest.hasCapability(NetworkCapabilities.NET_CAPABILITY_IMS)) {

            // if exists non-IMS network

            if (mDataNetworkList.stream()

                    .anyMatch(dataNetwork -> !dataNetwork.getNetworkCapabilities()

                                    .hasCapability(NetworkCapabilities.NET_CAPABILITY_IMS))) {

                evaluation.addDataDisallowedReason(

                        DataDisallowedReason.ONLY_ALLOWED_SINGLE_NETWORK);

            }

        }



        if (mDataSettingsManager.isDataInitialized()) {

            if (!mDataSettingsManager.isDataEnabled(DataUtils.networkCapabilityToApnType(
@@ -1644,8 +1652,10 @@ public class DataNetworkController extends Handler { 
        }



        // Check if there are other network that has higher priority, and only single data network

        // is allowed.

        if (isOnlySingleDataNetworkAllowed(dataNetwork.getTransport())) {

        // is allowed. Note IMS network is exempt from the single-connection rule.

        if (isOnlySingleDataNetworkAllowed(dataNetwork.getTransport())

                && !dataNetwork.getNetworkCapabilities()

                .hasCapability(NetworkCapabilities.NET_CAPABILITY_IMS)) {

            // If there is network request that has higher priority than this data network, then

            // tear down the network, regardless that network request is satisfied or not.

            if (mAllNetworkRequestList.stream()

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

+57 −1
Original line number Diff line number Diff line
@@ -198,7 +198,8 @@ public class DataNetworkControllerTest extends TelephonyTest { 
                    .setRoamingProtocol(ApnSetting.PROTOCOL_IP)

                    .setCarrierEnabled(true)

                    .setNetworkTypeBitmask((int) (TelephonyManager.NETWORK_TYPE_BITMASK_LTE

                            | TelephonyManager.NETWORK_TYPE_BITMASK_IWLAN))

                            | TelephonyManager.NETWORK_TYPE_BITMASK_IWLAN

                            | TelephonyManager.NETWORK_TYPE_BITMASK_1xRTT))

                    .setLingeringNetworkTypeBitmask((int) (TelephonyManager.NETWORK_TYPE_BITMASK_LTE

                            | TelephonyManager.NETWORK_TYPE_BITMASK_IWLAN

                            | TelephonyManager.NETWORK_TYPE_BITMASK_UMTS
@@ -1533,6 +1534,60 @@ public class DataNetworkControllerTest extends TelephonyTest { 
        assertThat(mDataNetworkControllerUT.isInternetUnmetered()).isFalse();

    }



    @Test

    public void testOnSinglePdnArbitrationExemptIms() throws Exception {

        // On CDMA network, only one data network is allowed.

        serviceStateChanged(TelephonyManager.NETWORK_TYPE_1xRTT,

                NetworkRegistrationInfo.REGISTRATION_STATE_HOME);

        // Preferred on cellular

        doReturn(AccessNetworkConstants.TRANSPORT_TYPE_WWAN).when(mAccessNetworksManager)

                .getPreferredTransportByNetworkCapability(anyInt());

        // Add IMS

        TelephonyNetworkRequest ims = createNetworkRequest(NetworkCapabilities.NET_CAPABILITY_IMS);

        mDataNetworkControllerUT.addNetworkRequest(ims);

        processAllMessages();



        verifyConnectedNetworkHasCapabilities(NetworkCapabilities.NET_CAPABILITY_IMS);



        // Add internet, should be compatible with

        mDataNetworkControllerUT.addNetworkRequest(

                createNetworkRequest(NetworkCapabilities.NET_CAPABILITY_INTERNET));

        setSuccessfulSetupDataResponse(mMockedDataServiceManagers

                .get(AccessNetworkConstants.TRANSPORT_TYPE_WWAN), 2);

        processAllMessages();



        verifyConnectedNetworkHasCapabilities(NetworkCapabilities.NET_CAPABILITY_INTERNET);

        verifyConnectedNetworkHasCapabilities(NetworkCapabilities.NET_CAPABILITY_IMS);



        // Add MMS, whose priority > internet, internet should be town down, IMS left untouched

        mDataNetworkControllerUT.addNetworkRequest(

                createNetworkRequest(NetworkCapabilities.NET_CAPABILITY_MMS));

        setSuccessfulSetupDataResponse(mMockedDataServiceManagers

                .get(AccessNetworkConstants.TRANSPORT_TYPE_WWAN), 3);

        processAllMessages();



        verifyConnectedNetworkHasCapabilities(NetworkCapabilities.NET_CAPABILITY_MMS);

        verifyConnectedNetworkHasCapabilities(NetworkCapabilities.NET_CAPABILITY_IMS);



        // Temporarily remove IMS

        mDataNetworkControllerUT.removeNetworkRequest(ims);

        processAllMessages();

        List<DataNetwork> dataNetworks = getDataNetworks();

        dataNetworks.get(0).tearDown(DataNetwork.TEAR_DOWN_REASON_CONNECTIVITY_SERVICE_UNWANTED);

        processAllMessages();



        verifyNoConnectedNetworkHasCapability(NetworkCapabilities.NET_CAPABILITY_IMS);



        // Add IMS, should be compatible with the existing internet

        setSuccessfulSetupDataResponse(mMockedDataServiceManagers

                .get(AccessNetworkConstants.TRANSPORT_TYPE_WWAN), 4);

        mDataNetworkControllerUT.addNetworkRequest(

                createNetworkRequest(NetworkCapabilities.NET_CAPABILITY_IMS));

        processAllMessages();

        verifyConnectedNetworkHasCapabilities(NetworkCapabilities.NET_CAPABILITY_INTERNET);

        verifyConnectedNetworkHasCapabilities(NetworkCapabilities.NET_CAPABILITY_IMS);

    }



    @Test

    public void testLinkStatusChanged() throws Exception {

        testSetupDataNetwork();
@@ -2357,6 +2412,7 @@ public class DataNetworkControllerTest extends TelephonyTest { 
        TelephonyNetworkRequest fotaRequest = createNetworkRequest(

                NetworkCapabilities.NET_CAPABILITY_FOTA);

        mDataNetworkControllerUT.addNetworkRequest(fotaRequest);



        processAllFutureMessages();

        // The existing internet data network should be torn down.

        verifyNoConnectedNetworkHasCapability(NetworkCapabilities.NET_CAPABILITY_DUN);