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

Commit 879c32fe authored by Sewook Seo's avatar Sewook Seo
Browse files

Data enabled check on attached NetworkRequest 

Data enabled check on first attached NetworkRequest when evaluate DataNetwork.

Bug: 268176386
Test: atest FrameworksTelephonyTests
Change-Id: Iedee7cbce6f991aeda4f31026e9bc68f0a0f65fd
parent 0d9e44be

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

+4 −8
Original line number Diff line number Diff line
@@ -1775,10 +1775,7 @@ public class DataNetworkController extends Handler { 
        }



        // Check if data is disabled

        boolean dataDisabled = false;

        if (!mDataSettingsManager.isDataEnabled()) {

            dataDisabled = true;

        }

        boolean dataDisabled = !mDataSettingsManager.isDataEnabled();



        // Check if data roaming is disabled

        if (mServiceState.getDataRoaming() && !mDataSettingsManager.isDataRoamingEnabled()) {
@@ -1793,10 +1790,9 @@ public class DataNetworkController extends Handler { 
        DataProfile dataProfile = dataNetwork.getDataProfile();

        if (dataProfile.getApnSetting() != null) {

            // Check if data is disabled for the APN type

            dataDisabled = !mDataSettingsManager.isDataEnabled(DataUtils

                    .networkCapabilityToApnType(DataUtils

                            .getHighestPriorityNetworkCapabilityFromDataProfile(

                                    mDataConfigManager, dataProfile)));

            dataDisabled = !mDataSettingsManager.isDataEnabled(

                    DataUtils.networkCapabilityToApnType(

                            dataNetwork.getApnTypeNetworkCapability()));



            // Sometimes network temporarily OOS and network type becomes UNKNOWN. We don't

            // tear down network in that case.

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

+8 −0
Original line number Diff line number Diff line
@@ -1639,6 +1639,14 @@ public class DataNetworkControllerTest extends TelephonyTest { 
        verifyNoConnectedNetworkHasCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET);

        verifyNoConnectedNetworkHasCapability(NetworkCapabilities.NET_CAPABILITY_SUPL);



        mDataNetworkControllerUT.obtainMessage(16 /*EVENT_REEVALUATE_EXISTING_DATA_NETWORKS*/,

                DataEvaluation.DataEvaluationReason.DATA_SERVICE_STATE_CHANGED).sendToTarget();



        processAllFutureMessages();



        // Make sure IMS network is not torn down

        verifyConnectedNetworkHasCapabilities(NetworkCapabilities.NET_CAPABILITY_MMS);



        // Remove MMS data enabled override

        mDataNetworkControllerUT.getDataSettingsManager().setMobileDataPolicy(TelephonyManager

                .MOBILE_DATA_POLICY_MMS_ALWAYS_ALLOWED, false);