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

Commit 015dd6c8 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge changes from topics "srvcc", "unmetered_configs" am: 15d84436 am: 31980d6a 

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



Change-Id: I476bab0bc091b438120802f65103a4fcac1d6153
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 6ec1a8d5 31980d6a

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

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

        }

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

+2 −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,

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