commit f56154f898cc42c618fe8c1318cb4fbe07d581ab
author Mark Chien <markchien@google.com> Wed Apr 15 19:15:18 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Apr 15 19:15:18 2020 +0000
tree 297f216bf7cf65128115bc20ac236ee501d1f704
parent 3f20007cda670d3158f2e37cc025868d19577a7e
parent cc3b1291094223137e9c44d132cf88a84fa3972c

Merge "Do not stop IpServer when recieve wifi ap disabling state." am: 197e35198d am: 7018843a2e am: b90f7a5c5c am: cc3b129109

Change-Id: Ie3a1162f1a9f3853235d79a6ad1d9fb3d43ad646

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);