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

Commit d1623f4f authored by Amit Mahajan's avatar Amit Mahajan Committed by android-build-team Robot
Browse files

Increase waiting state timeout from 30s to 5min. 

Test: runtest --path
frameworks/opt/telephony/tests/telephonytests/src/com/android/
internal/telephony/gsm/GsmInboundSmsHandlerTest.java
Bug: 68704659
Bug: 69475609

Change-Id: I79bded1ca345978075836bf247fccb53bc55caa5
(cherry picked from commit 8907a6dc)
parent 551e63a2

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

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

     * state */

    private static final int EVENT_STATE_TIMEOUT = 10;

    private static final int EVENT_STATE_TIMEOUT = 10;





    /** Timeout duration for EVENT_STATE_TIMEOUT */

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

    @VisibleForTesting

    @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. */

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

    private static final int WAKELOCK_TIMEOUT = 3000;

    private static final int WAKELOCK_TIMEOUT = 3000;

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

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

import android.os.UserManager;

import android.provider.Telephony;

import android.provider.Telephony;

import android.support.test.filters.FlakyTest;

import android.support.test.filters.FlakyTest;

import android.support.test.filters.LargeTest;

import android.support.test.filters.MediumTest;

import android.support.test.filters.MediumTest;

import android.test.mock.MockContentResolver;

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

    @FlakyTest

    @Ignore

    @Ignore

    @Test

    @Test

    @MediumTest

    @LargeTest

    public void testWaitingStateTimeout() throws Exception {

    public void testWaitingStateTimeout() throws Exception {

        transitionFromStartupToIdle();

        transitionFromStartupToIdle();