Merge "Simplify the return condition in stop()" into sc-dev

2021-07-01 09:09:39 +00:00
parent 8ba13e99e8 5ca769ef4a
commit b851d80de2
2 changed files with 6 additions and 6 deletions
--- a/tests/unit/java/com/android/server/ConnectivityServiceTest.java
+++ b/tests/unit/java/com/android/server/ConnectivityServiceTest.java
@@ -5566,6 +5566,8 @@ public class ConnectivityServiceTest {
            // the follow-up network disconnection will be processed first.
            mWiFiNetworkAgent.setKeepaliveResponseDelay(3 * TIMEOUT_MS);
            ka.stop();
+            // Call stop() twice shouldn't result in crash, b/182586681.
+            ka.stop();

            // Make sure the stop has been processed. Wait for executor idle is needed to prevent
            // flaky since the actual stop call to the service is delegated to executor thread.