From 4dee5fb135b11e155c81fc6defe6c57a583c5d81 Mon Sep 17 00:00:00 2001
From: Erik Kline <ek@google.com>
Date: Wed, 9 May 2018 14:45:21 +0900
Subject: Also await IpClient's shutdown

It may be best to await shutdown of IpClient, especially in cases
where cleanup code would otherwise race with IP address assignment
and other bringup code.

Test: as follows
    - built
    - flashed
    - booted
    - frameworks/opt/net/wifi/tests/wifitests/runtests.sh passes
Test: Unit test
Test: Ran WifiManager ACTS tests locally.
Bug: 79400794
Change-Id: I1a02d70660ec54fda9a36399b285cda054cde8d3
---
 tests/wifitests/src/com/android/server/wifi/WifiStateMachineTest.java | 1 +
 1 file changed, 1 insertion(+)

(limited to 'tests')

diff --git a/tests/wifitests/src/com/android/server/wifi/WifiStateMachineTest.java b/tests/wifitests/src/com/android/server/wifi/WifiStateMachineTest.java
index 79966d7f1..b33b0b59f 100644
--- a/tests/wifitests/src/com/android/server/wifi/WifiStateMachineTest.java
+++ b/tests/wifitests/src/com/android/server/wifi/WifiStateMachineTest.java
@@ -2366,5 +2366,6 @@ public class WifiStateMachineTest {
         mWsm.setOperationalMode(WifiStateMachine.DISABLED_MODE, null);
         mLooper.dispatchAll();
         verify(mIpClient).shutdown();
+        verify(mIpClient).awaitShutdown();
     }
 }
-- 
cgit v1.2.3