commit b353c7eac36f074f91d35706e1abfa39146bc328
author Paul Hu <paulhu@google.com> Thu Apr 16 01:31:06 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Apr 16 01:31:06 2020 +0000
tree 34f9eb71acaf9a4d54e1757d9ac9f0abb14317d6
parent bdf1003c3bfa9486515c207067c5c25218c2a47d
parent 648fc2c8eaca070aafa229f0bc0b9839e4978d1f

Merge "[TNU05] Add no upstream notification"

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 848f204..9a95d44 100644
--- a/Tethering/src/com/android/networkstack/tethering/Tethering.java
+++ b/Tethering/src/com/android/networkstack/tethering/Tethering.java
@@ -929,8 +929,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);