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

Commit 44c60ce8 authored by Amit Mahajan's avatar Amit Mahajan Committed by Android (Google) Code Review
Browse files

Merge "Increase waiting state timeout from 30s to 5min." into oc-mr1-dev

parents 26d7e38e 8907a6dc

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;
@@ -785,7 +786,7 @@ public class GsmInboundSmsHandlerTest extends TelephonyTest { 
    @FlakyTest

    @Ignore

    @Test

    @MediumTest

    @LargeTest

    public void testWaitingStateTimeout() throws Exception {

        transitionFromStartupToIdle();