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

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

CP bugfixes from ag/13300921 to QPR3 am: 0ca780c9 

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6a037b593d4d9ec0cc82f20b8360139b7126ce4a
parents edbf48ad 0ca780c9

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

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

    private boolean mNrSaMmwaveUnmetered = false;

    private boolean mNrSaSub6Unmetered = false;

    private boolean mRoamingUnmetered = false;

    private boolean mNrNsaRoamingUnmetered = false;



    // stats per data call recovery event

    private DataStallRecoveryStats mDataStallRecoveryStats;
@@ -4138,7 +4138,7 @@ public class DcTracker extends Handler { 
    private void reevaluateUnmeteredConnections() {

        log("reevaluateUnmeteredConnections");

        int rat = mPhone.getDisplayInfoController().getTelephonyDisplayInfo().getNetworkType();

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

        if (isNrUnmetered() && (!mPhone.getServiceState().getRoaming() || mNrNsaRoamingUnmetered)) {

            setDataConnectionUnmetered(true);

            if (!mWatchdog) {

                startWatchdogAlarm();
@@ -5234,7 +5234,7 @@ 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(

                mNrNsaRoamingUnmetered = b.getBoolean(

                        CarrierConfigManager.KEY_UNMETERED_NR_NSA_WHEN_ROAMING_BOOL);

            }

        }

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

+12 −3
Original line number Diff line number Diff line
@@ -1814,9 +1814,9 @@ public class DcTrackerTest extends TelephonyTest { 
        clearInvocations(mHandler);

    }



    private void setUpSubscriptionPlans(boolean is5GUnmetered) throws Exception {

    private void setUpSubscriptionPlans(boolean isNrUnmetered) throws Exception {

        List<SubscriptionPlan> plans = new ArrayList<>();

        if (is5GUnmetered) {

        if (isNrUnmetered) {

            plans.add(SubscriptionPlan.Builder

                    .createRecurring(ZonedDateTime.parse("2007-03-14T00:00:00.000Z"),

                            Period.ofMonths(1))
@@ -1834,6 +1834,10 @@ public class DcTrackerTest extends TelephonyTest { 
        replaceInstance(DcTracker.class, "mSubscriptionPlans", mDct, plans);

    }



    private void resetSubscriptionPlans() throws Exception {

        replaceInstance(DcTracker.class, "mSubscriptionPlans", mDct, null);

    }



    private boolean isNetworkTypeUnmetered(int networkType) throws Exception {

        Method method = DcTracker.class.getDeclaredMethod(

                "isNetworkTypeUnmetered", int.class);
@@ -1896,7 +1900,6 @@ public class DcTrackerTest extends TelephonyTest { 
        plans.add(SubscriptionPlan.Builder

                .createRecurring(ZonedDateTime.parse("2007-03-14T00:00:00.000Z"),

                        Period.ofMonths(1))

                .setTitle("Some 5GB Plan")

                .setDataLimit(SubscriptionPlan.BYTES_UNLIMITED,

                        SubscriptionPlan.LIMIT_BEHAVIOR_THROTTLED)

                .build());
@@ -1905,6 +1908,8 @@ public class DcTrackerTest extends TelephonyTest { 
        assertTrue(isNetworkTypeUnmetered(TelephonyManager.NETWORK_TYPE_NR));

        assertTrue(isNetworkTypeUnmetered(TelephonyManager.NETWORK_TYPE_LTE));

        assertTrue(isNetworkTypeUnmetered(TelephonyManager.NETWORK_TYPE_UNKNOWN));



        resetSubscriptionPlans();

    }



    @Test
@@ -1953,6 +1958,7 @@ public class DcTrackerTest extends TelephonyTest { 
        verify(mDataConnection, times(2)).onMeterednessChanged(true);



        resetDataConnection(id);

        resetSubscriptionPlans();

    }



    @Test
@@ -2014,6 +2020,7 @@ public class DcTrackerTest extends TelephonyTest { 
        verify(mDataConnection, times(2)).onMeterednessChanged(true);



        resetDataConnection(id);

        resetSubscriptionPlans();

    }



    @Test
@@ -2042,6 +2049,7 @@ public class DcTrackerTest extends TelephonyTest { 
        verify(mDataConnection, times(1)).onMeterednessChanged(false);



        resetDataConnection(id);

        resetSubscriptionPlans();

    }



    @Test
@@ -2074,6 +2082,7 @@ public class DcTrackerTest extends TelephonyTest { 
        assertFalse(getWatchdogStatus());



        resetDataConnection(id);

        resetSubscriptionPlans();

    }



    /**