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

Commit abe310da authored by Amit Mahajan's avatar Amit Mahajan Committed by android-build-merger
Browse files

Merge "Increase waiting state timeout from 30s to 5min." 

am: 25535490

Change-Id: Ie6cbdf10e112afe298c1de15764870e55c08fbbf
parents f1cc4869 25535490

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

+2 −2
Original line number Diff line number Diff line
@@ -165,9 +165,9 @@ public abstract class InboundSmsHandler extends StateMachine { 
     * state */

    private static final int EVENT_STATE_TIMEOUT = 10;



    /** Timeout duration for EVENT_STATE_TIMEOUT */

    /** Timeout duration for EVENT_STATE_TIMEOUT (5 minutes) */

    @VisibleForTesting

    public static final int STATE_TIMEOUT = 30000;

    public static final int STATE_TIMEOUT = 5 * 60 * 1000;



    /** Wakelock release delay when returning to idle state. */

    private static final int WAKELOCK_TIMEOUT = 3000;

tests/telephonytests/src/com/android/internal/telephony/gsm/GsmInboundSmsHandlerTest.java

+2 −1
Original line number Diff line number Diff line
@@ -47,6 +47,7 @@ import android.os.UserHandle; 
import android.os.UserManager;

import android.provider.Telephony;

import android.support.test.filters.FlakyTest;

import android.support.test.filters.LargeTest;

import android.support.test.filters.MediumTest;

import android.test.mock.MockContentResolver;
@@ -781,7 +782,7 @@ public class GsmInboundSmsHandlerTest extends TelephonyTest { 
    @FlakyTest

    @Ignore

    @Test

    @MediumTest

    @LargeTest

    public void testWaitingStateTimeout() throws Exception {

        transitionFromStartupToIdle();