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

Commit af7065cc authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Extend timeout for receiving broadcasts" am: 15b5b58a am: a1178955 am: 0343d526 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1614339

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8ba4984427e72554c0aff2c173e72bdb93a9ea3c
parents 0b646292 0343d526

tests/net/java/com/android/server/ConnectivityServiceTest.java

+4 −1
Original line number Diff line number Diff line
@@ -351,6 +351,9 @@ public class ConnectivityServiceTest { 
    private static final String TAG = "ConnectivityServiceTest";



    private static final int TIMEOUT_MS = 500;

    // Broadcasts can take a long time to be delivered. The test will not wait for that long unless

    // there is a failure, so use a long timeout.

    private static final int BROADCAST_TIMEOUT_MS = 30_000;

    private static final int TEST_LINGER_DELAY_MS = 400;

    private static final int TEST_NASCENT_DELAY_MS = 300;

    // Chosen to be less than the linger and nascent timeout. This ensures that we can distinguish
@@ -1685,7 +1688,7 @@ public class ConnectivityServiceTest { 
        }



        public Intent expectBroadcast() throws Exception {

            return expectBroadcast(TIMEOUT_MS);

            return expectBroadcast(BROADCAST_TIMEOUT_MS);

        }



        public void expectNoBroadcast(int timeoutMs) throws Exception {