commit 8b075650e1a2346cd53014dc714a587963c9940f
author Erik Kline <ek@google.com> Fri Feb 23 07:46:34 2018 +0000
committer android-build-merger <android-build-merger@google.com> Fri Feb 23 07:46:34 2018 +0000
tree 16e8f4802e5e638359a468213486bfffd18aab3f
parent fdd22f0150bc353545c6978c441079699130083b
parent 206f8c6993e3d4716391ffc1619ef05158eb00e6

Wait for IpClient to shutdown am: 7048285cb3
am: 206f8c6993

Change-Id: I96b1a4a706afc82b7a4a59f311798e3825b0ee00

service-t/src/com/android/server/ethernet/EthernetNetworkFactory.java

diff --git a/service-t/src/com/android/server/ethernet/EthernetNetworkFactory.java b/service-t/src/com/android/server/ethernet/EthernetNetworkFactory.java
index d464879..f95500e 100644
--- a/service-t/src/com/android/server/ethernet/EthernetNetworkFactory.java
+++ b/service-t/src/com/android/server/ethernet/EthernetNetworkFactory.java
@@ -355,8 +355,10 @@
         void stop() {
             if (mIpClient != null) {
                 mIpClient.shutdown();
+                mIpClient.awaitShutdown();
                 mIpClient = null;
             }
+
             // ConnectivityService will only forget our NetworkAgent if we send it a NetworkInfo object
             // with a state of DISCONNECTED or SUSPENDED. So we can't simply clear our NetworkInfo here:
             // that sets the state to IDLE, and ConnectivityService will still think we're connected.