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

Commit 5adf561a authored by Jack Yu's avatar Jack Yu
Browse files

Only reset throttling when carrier config is on 

The data retry/throttling was reset when TAC changes. This
should only happen when carrier config
unthrottle_data_retry_when_tac_changes_bool is on.

Fix: 229273271
Test: Manual + atest DataRetryManagerTest
Change-Id: Ie884e0faa71cf9f3e125a572e67e3003c750a47b
parent 96d114be

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