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

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

Change-Id: I0ff153fae086c9b0cc8c2300d97c7e2e8da7b055

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