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

Commit f502f116 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "[DSRM] Do recovery actions only after validation passed once." into tm-dev am: 79c8067f 

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



Change-Id: I669e3d82375592afa68eed113e1e84ede3ba0e63
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 27f3ef2b 79c8067f

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

+7 −5
Original line number Diff line number Diff line
@@ -364,6 +364,7 @@ public class DataStallRecoveryManager extends Handler { 
        if (isValid) {

            reset();

        } else {

            if (mIsValidNetwork || isRecoveryAlreadyStarted()) {

                mIsValidNetwork = false;

                if (isRecoveryNeeded(true)) {

                    log("trigger data stall recovery");
@@ -372,6 +373,7 @@ public class DataStallRecoveryManager extends Handler { 
                }

            }

        }

    }



    /** Reset the action to initial step. */

    private void resetAction() {

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

+30 −1
Original line number Diff line number Diff line
@@ -87,7 +87,6 @@ public class DataStallRecoveryManagerTest extends TelephonyTest { 
                        mMockedWwanDataServiceManager,

                        mTestableLooper.getLooper(),

                        mDataStallRecoveryManagerCallback);

        sendOnInternetDataNetworkCallback(true);

        logd("DataStallRecoveryManagerTest -Setup!");

    }
@@ -128,6 +127,7 @@ public class DataStallRecoveryManagerTest extends TelephonyTest { 


    @Test

    public void testRecoveryStepPDPReset() throws Exception {

        sendOnInternetDataNetworkCallback(true);

        mDataStallRecoveryManager.setRecoveryAction(1);

        doReturn(mSignalStrength).when(mPhone).getSignalStrength();

        doReturn(PhoneConstants.State.IDLE).when(mPhone).getState();
@@ -141,6 +141,7 @@ public class DataStallRecoveryManagerTest extends TelephonyTest { 


    @Test

    public void testRecoveryStepRestartRadio() throws Exception {

        sendOnInternetDataNetworkCallback(true);

        mDataStallRecoveryManager.setRecoveryAction(3);

        doReturn(mSignalStrength).when(mPhone).getSignalStrength();

        doReturn(PhoneConstants.State.IDLE).when(mPhone).getState();
@@ -154,6 +155,7 @@ public class DataStallRecoveryManagerTest extends TelephonyTest { 


    @Test

    public void testRecoveryStepModemReset() throws Exception {

        sendOnInternetDataNetworkCallback(true);

        mDataStallRecoveryManager.setRecoveryAction(4);

        doReturn(mSignalStrength).when(mPhone).getSignalStrength();

        doReturn(PhoneConstants.State.IDLE).when(mPhone).getState();
@@ -168,6 +170,7 @@ public class DataStallRecoveryManagerTest extends TelephonyTest { 


    @Test

    public void testDoNotDoRecoveryActionWhenPoorSignal() throws Exception {

        sendOnInternetDataNetworkCallback(true);

        mDataStallRecoveryManager.setRecoveryAction(3);

        doReturn(1).when(mSignalStrength).getLevel();

        doReturn(mSignalStrength).when(mPhone).getSignalStrength();
@@ -183,6 +186,7 @@ public class DataStallRecoveryManagerTest extends TelephonyTest { 


    @Test

    public void testDoNotDoRecoveryActionWhenDialCall() throws Exception {

        sendOnInternetDataNetworkCallback(true);

        mDataStallRecoveryManager.setRecoveryAction(3);

        doReturn(3).when(mSignalStrength).getLevel();

        doReturn(mSignalStrength).when(mPhone).getSignalStrength();
@@ -198,6 +202,7 @@ public class DataStallRecoveryManagerTest extends TelephonyTest { 


    @Test

    public void testDoNotDoRecoveryBySendMessageDelayedWhenDialCall() throws Exception {

        sendOnInternetDataNetworkCallback(true);

        sendValidationStatusCallback(NetworkAgent.VALIDATION_STATUS_VALID);

        mDataStallRecoveryManager.setRecoveryAction(0);

        doReturn(PhoneConstants.State.OFFHOOK).when(mPhone).getState();
@@ -217,6 +222,7 @@ public class DataStallRecoveryManagerTest extends TelephonyTest { 


    @Test

    public void testDoNotContinueRecoveryActionAfterModemReset() throws Exception {

        sendOnInternetDataNetworkCallback(true);

        sendValidationStatusCallback(NetworkAgent.VALIDATION_STATUS_VALID);

        mDataStallRecoveryManager.setRecoveryAction(0);

        doReturn(PhoneConstants.State.IDLE).when(mPhone).getState();
@@ -252,6 +258,7 @@ public class DataStallRecoveryManagerTest extends TelephonyTest { 


    @Test

    public void testDoRecoveryWhenMeetDataStallAgain() throws Exception {

        sendOnInternetDataNetworkCallback(true);

        sendValidationStatusCallback(NetworkAgent.VALIDATION_STATUS_VALID);

        mDataStallRecoveryManager.setRecoveryAction(0);

        doReturn(PhoneConstants.State.IDLE).when(mPhone).getState();
@@ -296,6 +303,7 @@ public class DataStallRecoveryManagerTest extends TelephonyTest { 


    @Test

    public void testDoNotDoRecoveryWhenDataNoService() throws Exception {

        sendOnInternetDataNetworkCallback(true);

        mDataStallRecoveryManager.setRecoveryAction(1);

        doReturn(mSignalStrength).when(mPhone).getSignalStrength();

        doReturn(PhoneConstants.State.IDLE).when(mPhone).getState();
@@ -310,6 +318,7 @@ public class DataStallRecoveryManagerTest extends TelephonyTest { 


    @Test

    public void testDoNotDoRecoveryWhenDataNetworkNotConnected() throws Exception {

        sendOnInternetDataNetworkCallback(true);

        mDataStallRecoveryManager.setRecoveryAction(1);

        doReturn(mSignalStrength).when(mPhone).getSignalStrength();

        doReturn(PhoneConstants.State.IDLE).when(mPhone).getState();
@@ -321,4 +330,24 @@ public class DataStallRecoveryManagerTest extends TelephonyTest { 


        assertThat(mDataStallRecoveryManager.getRecoveryAction()).isEqualTo(1);

    }



    @Test

    public void testDoNotDoRecoveryIfNoValidationPassedYet() throws Exception {

        sendOnInternetDataNetworkCallback(false);

        doReturn(mSignalStrength).when(mPhone).getSignalStrength();

        doReturn(PhoneConstants.State.IDLE).when(mPhone).getState();



        logd("Sending validation failed callback");

        sendValidationStatusCallback(NetworkAgent.VALIDATION_STATUS_NOT_VALID);

        processAllFutureMessages();



        // Handle multiple VALIDATION_STATUS_NOT_VALID and make sure we don't attempt recovery

        for (int i = 0; i < 4; i++) {

            sendValidationStatusCallback(NetworkAgent.VALIDATION_STATUS_NOT_VALID);

            logd("Sending validation failed callback");

            processAllMessages();

            moveTimeForward(101);

            assertThat(mDataStallRecoveryManager.getRecoveryAction()).isEqualTo(0);

        }

    }

}