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

Commit fd6aafd8 authored by Sewook Seo's avatar Sewook Seo Committed by Android (Google) Code Review
Browse files

Merge "Data enabled check on attached NetworkRequest" into udc-dev

parents a664df66 879c32fe

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
@@ -1675,6 +1675,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);