commit 6092d39f697074d3cb45c4d2fa1c85c7a7f7872c
author Mark Chien <markchien@google.com> Thu Apr 16 03:59:52 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Apr 16 03:59:52 2020 +0000
tree a128d7205aea238f7d1d112987c60528e7b63d89
parent 09b3311c2f73ead9806c252a918f38a14fbd1e30
parent dfcd502487979dfb26ea0266f2b4e7f5cc642b2a

Merge "Do not stop IpServer when recieve wifi ap disabling state." into rvc-dev am: b28fd19f26 am: dfcd502487 am: d5d27c5e08

Change-Id: Ic74e494e8eee350fcaf0fc2bbb8275e39312689a

Tethering/src/com/android/networkstack/tethering/Tethering.java

diff --git a/Tethering/src/com/android/networkstack/tethering/Tethering.java b/Tethering/src/com/android/networkstack/tethering/Tethering.java
index f3cead9..bae54a5 100644
--- a/Tethering/src/com/android/networkstack/tethering/Tethering.java
+++ b/Tethering/src/com/android/networkstack/tethering/Tethering.java
@@ -922,8 +922,10 @@
                     case WifiManager.WIFI_AP_STATE_ENABLED:
                         enableWifiIpServingLocked(ifname, ipmode);
                         break;
-                    case WifiManager.WIFI_AP_STATE_DISABLED:
                     case WifiManager.WIFI_AP_STATE_DISABLING:
+                        // We can see this state on the way to disabled.
+                        break;
+                    case WifiManager.WIFI_AP_STATE_DISABLED:
                     case WifiManager.WIFI_AP_STATE_FAILED:
                     default:
                         disableWifiIpServingLocked(ifname, curState);