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

Commit 398463f9 authored by Sarah Chin's avatar Sarah Chin Committed by Automerger Merge Worker
Browse files

Merge "Add logic for NR roaming meteredness" into rvc-dev am: 602d794f 

Change-Id: Iaa18d765e04c4c4e80a7a1f104c7b7b41ed9021c
parents ac5913b1 602d794f

src/java/com/android/internal/telephony/dataconnection/DcTracker.java

+6 −2
Original line number Diff line number Diff line
@@ -326,6 +326,7 @@ public class DcTracker extends Handler { 
    private boolean mNrSaAllUnmetered = false;

    private boolean mNrSaMmwaveUnmetered = false;

    private boolean mNrSaSub6Unmetered = false;

    private boolean mRoamingUnmetered = false;



    /* Used to check whether 5G timers are currently active and waiting to go off */

    private boolean mHysteresis = false;
@@ -4089,7 +4090,8 @@ public class DcTracker extends Handler { 
        boolean nrUnmetered = isNetworkTypeUnmetered(NETWORK_TYPE_NR);

        boolean nrNsaUnmetered = isNrNsaFrequencyRangeUnmetered();

        boolean nrSaUnmetered = isNrSaFrequencyRangeUnmetered();

        if (nrUnmetered || nrNsaUnmetered || nrSaUnmetered) {

        if ((nrUnmetered || nrNsaUnmetered || nrSaUnmetered)

                && !mPhone.getServiceState().getRoaming() || mRoamingUnmetered) {

            if (DBG) log("NR is unmetered");

            if ((nrUnmetered || nrNsaUnmetered) && mPhone.getServiceState().getNrState()

                    == NetworkRegistrationInfo.NR_STATE_CONNECTED
@@ -4213,7 +4215,7 @@ public class DcTracker extends Handler { 
        TelephonyDisplayInfo telephonyDisplayInfo =

                new TelephonyDisplayInfo(dataNetworkType, displayNetworkType);

        if (!telephonyDisplayInfo.equals(mTelephonyDisplayInfo)) {

            log("Display info changed. " + telephonyDisplayInfo);

            log("Display info changed: " + telephonyDisplayInfo);

            mTelephonyDisplayInfo = telephonyDisplayInfo;

            mPhone.notifyDisplayInfoChanged(telephonyDisplayInfo);

            return true;
@@ -5296,6 +5298,8 @@ public class DcTracker extends Handler { 
                        CarrierConfigManager.KEY_UNMETERED_NR_SA_MMWAVE_BOOL);

                mNrSaSub6Unmetered = b.getBoolean(

                        CarrierConfigManager.KEY_UNMETERED_NR_SA_SUB6_BOOL);

                mRoamingUnmetered = b.getBoolean(

                        CarrierConfigManager.KEY_UNMETERED_NR_NSA_WHEN_ROAMING_BOOL);

            }

        }

tests/telephonytests/src/com/android/internal/telephony/dataconnection/DcTrackerTest.java

+4 −4
Original line number Diff line number Diff line
@@ -1855,9 +1855,9 @@ public class DcTrackerTest extends TelephonyTest { 
        setUpSubscriptionPlans(true);

        setUpWatchdogTimer();



        // Hysteresis active for 10s

        // Hysteresis active for 100s

        doReturn(1).when(mPhone).getSubId();

        mBundle.putInt(CarrierConfigManager.KEY_5G_ICON_DISPLAY_GRACE_PERIOD_SEC_INT, 10000);

        mBundle.putInt(CarrierConfigManager.KEY_5G_ICON_DISPLAY_GRACE_PERIOD_SEC_INT, 100);

        Intent intent = new Intent(CarrierConfigManager.ACTION_CARRIER_CONFIG_CHANGED);

        intent.putExtra(CarrierConfigManager.EXTRA_SLOT_INDEX, mPhone.getPhoneId());

        intent.putExtra(SubscriptionManager.EXTRA_SUBSCRIPTION_INDEX, mPhone.getSubId());
@@ -1925,9 +1925,9 @@ public class DcTrackerTest extends TelephonyTest { 
        waitForLastHandlerAction(mDcTrackerTestHandler.getThreadHandler());

        assertFalse(getWatchdogStatus());



        // Hysteresis active for 10s

        // Hysteresis active for 100s

        doReturn(1).when(mPhone).getSubId();

        mBundle.putInt(CarrierConfigManager.KEY_5G_ICON_DISPLAY_GRACE_PERIOD_SEC_INT, 10000);

        mBundle.putInt(CarrierConfigManager.KEY_5G_ICON_DISPLAY_GRACE_PERIOD_SEC_INT, 100);

        Intent intent = new Intent(CarrierConfigManager.ACTION_CARRIER_CONFIG_CHANGED);

        intent.putExtra(CarrierConfigManager.EXTRA_SLOT_INDEX, mPhone.getPhoneId());

        intent.putExtra(SubscriptionManager.EXTRA_SUBSCRIPTION_INDEX, mPhone.getSubId());