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

Commit 4c0a597a authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Only reset throttling when carrier config is on" am: bb8c738f 

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



Change-Id: I66f643d7fb70a92ef7bd15534b8c3de5bbd727a2
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 753fdb97 bb8c738f

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

+4 −1
Original line number Diff line number Diff line
@@ -954,7 +954,10 @@ public class DataRetryManager extends Handler { 
        mRil.registerForOn(this, EVENT_RADIO_ON, null);

        mRil.registerForModemReset(this, EVENT_MODEM_RESET, null);



        mPhone.getServiceStateTracker().registerForAreaCodeChanged(this, EVENT_TAC_CHANGED, null);

        if (mDataConfigManager.shouldResetDataThrottlingWhenTacChanges()) {

            mPhone.getServiceStateTracker().registerForAreaCodeChanged(this, EVENT_TAC_CHANGED,

                    null);

        }

    }



    @Override

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

+2 −0
Original line number Diff line number Diff line
@@ -679,6 +679,8 @@ public class DataRetryManagerTest extends TelephonyTest { 


    @Test

    public void testTacChangedReset() {

        doReturn(true).when(mDataConfigManager).shouldResetDataThrottlingWhenTacChanges();



        testDataSetupRetryNetworkSuggestedNeverRetry();

        Mockito.clearInvocations(mDataRetryManagerCallbackMock);