Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1f1a9776 authored by Mark Chien's avatar Mark Chien Committed by Automerger Merge Worker
Browse files

Merge "Do not stop IpServer when recieve wifi ap disabling state." am:... 

Merge "Do not stop IpServer when recieve wifi ap disabling state." am: 197e3519 am: 46061cdb am: ac468a11 am: 205fe537

Change-Id: Ie3a1162f1a9f3853235d79a6ad1d9fb3d43ad646
parents 7d62465e 205fe537

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

+3 −1
Original line number Diff line number Diff line
@@ -922,8 +922,10 @@ public class Tethering { 
                    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);