| commit | dfcd502487979dfb26ea0266f2b4e7f5cc642b2a | [log] [tgz] |
|---|---|---|
| author | Mark Chien <markchien@google.com> | Thu Apr 16 03:26:36 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Apr 16 03:26:36 2020 +0000 |
| tree | 297f216bf7cf65128115bc20ac236ee501d1f704 | |
| parent | da200e3cb7ecb95e9558d910ad9026409c06e4e3 [diff] | |
| parent | 8c98b3d35e187b476f9669b183c957ddd738fdfd [diff] |
Merge "Do not stop IpServer when recieve wifi ap disabling state." into rvc-dev am: b28fd19f26 Change-Id: Ie0dbdea250cf31a4877e5b94fdf61e8f37705090
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);