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

Commit d31232a0 authored by Sarah Chin's avatar Sarah Chin Committed by Android (Google) Code Review
Browse files

Merge "Use new carrier configs for unmetered network types"

parents 8387422c 9834d962

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

+6 −3
Original line number Diff line number Diff line
@@ -2796,9 +2796,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);

        }

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

+2 −0
Original line number Diff line number Diff line
@@ -669,6 +669,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,

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();