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

Commit f58d7c83 authored by Jack Yu's avatar Jack Yu
Browse files

Renamed retry interval to retry duration 

Fix: 171981823
Test: FrameworksTelephonyTests
Change-Id: Ibb1332d85a0518c96ba8fd01b24b2699c915c89d
parent b5671c10

src/java/com/android/internal/telephony/RIL.java

+1 −1
Original line number Diff line number Diff line
@@ -7178,7 +7178,7 @@ public class RIL extends BaseCommands implements CommandsInterface { 


        return new DataCallResponse.Builder()

                .setCause(cause)

                .setRetryIntervalMillis(suggestedRetryTime)

                .setRetryDurationMillis(suggestedRetryTime)

                .setId(cid)

                .setLinkStatus(active)

                .setProtocolType(protocolType)

src/java/com/android/internal/telephony/RetryManager.java

+1 −1
Original line number Diff line number Diff line
@@ -130,7 +130,7 @@ public class RetryManager { 
    /**

     * The value indicating network did not suggest any retry delay

     */

    public static final long NO_SUGGESTED_RETRY_DELAY = DataCallResponse.RETRY_INTERVAL_UNDEFINED;

    public static final long NO_SUGGESTED_RETRY_DELAY = DataCallResponse.RETRY_DURATION_UNDEFINED;



    /**

     * If the network suggests a retry delay in the data call setup response, we will retry

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

+2 −2
Original line number Diff line number Diff line
@@ -725,7 +725,7 @@ public class DataConnection extends StateMachine { 
        if (mDcTesterFailBringUpAll.getDcFailBringUp().mCounter  > 0) {

            DataCallResponse response = new DataCallResponse.Builder()

                    .setCause(mDcTesterFailBringUpAll.getDcFailBringUp().mFailCause)

                    .setRetryIntervalMillis(

                    .setRetryDurationMillis(

                            mDcTesterFailBringUpAll.getDcFailBringUp().mSuggestedRetryTime)

                    .setMtuV4(PhoneConstants.UNSET_MTU)

                    .setMtuV6(PhoneConstants.UNSET_MTU)
@@ -2941,7 +2941,7 @@ public class DataConnection extends StateMachine { 
         * The value of Long.MAX_VALUE(0x7fffffffffffffff) means no retry.

         */



        long suggestedRetryTime = response.getRetryIntervalMillis();

        long suggestedRetryTime = response.getRetryDurationMillis();



        // The value < 0 means no value is suggested

        if (suggestedRetryTime < 0) {

tests/telephonytests/src/com/android/internal/telephony/RILTest.java

+2 −2
Original line number Diff line number Diff line
@@ -2156,7 +2156,7 @@ public class RILTest extends TelephonyTest { 


        DataCallResponse response = new DataCallResponse.Builder()

                .setCause(0)

                .setRetryIntervalMillis(-1L)

                .setRetryDurationMillis(-1L)

                .setId(0)

                .setLinkStatus(2)

                .setProtocolType(ApnSetting.PROTOCOL_IPV4V6)
@@ -2229,7 +2229,7 @@ public class RILTest extends TelephonyTest { 


        response = new DataCallResponse.Builder()

                .setCause(0)

                .setRetryIntervalMillis(-1L)

                .setRetryDurationMillis(-1L)

                .setId(0)

                .setLinkStatus(2)

                .setProtocolType(ApnSetting.PROTOCOL_IPV4V6)

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

+4 −4
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ public class DataCallResponseTest extends AndroidTestCase { 
    public void testParcel() throws Exception {

        DataCallResponse response = new DataCallResponse.Builder()

                .setCause(0)

                .setRetryIntervalMillis(-1L)

                .setRetryDurationMillis(-1L)

                .setId(1)

                .setLinkStatus(2)

                .setProtocolType(ApnSetting.PROTOCOL_IP)
@@ -65,7 +65,7 @@ public class DataCallResponseTest extends AndroidTestCase { 
    public void testEquals() throws Exception {

        DataCallResponse response = new DataCallResponse.Builder()

                .setCause(0)

                .setRetryIntervalMillis(-1L)

                .setRetryDurationMillis(-1L)

                .setId(1)

                .setLinkStatus(2)

                .setProtocolType(ApnSetting.PROTOCOL_IP)
@@ -82,7 +82,7 @@ public class DataCallResponseTest extends AndroidTestCase { 


        DataCallResponse response1 = new DataCallResponse.Builder()

                .setCause(0)

                .setRetryIntervalMillis(-1L)

                .setRetryDurationMillis(-1L)

                .setId(1)

                .setLinkStatus(2)

                .setProtocolType(ApnSetting.PROTOCOL_IP)
@@ -102,7 +102,7 @@ public class DataCallResponseTest extends AndroidTestCase { 


        DataCallResponse response2 = new DataCallResponse.Builder()

                .setCause(1)

                .setRetryIntervalMillis(-1L)

                .setRetryDurationMillis(-1L)

                .setId(1)

                .setLinkStatus(3)

                .setProtocolType(ApnSetting.PROTOCOL_IP)