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

Commit c44e719b 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." into... 

Merge "Do not stop IpServer when recieve wifi ap disabling state." into rvc-dev am: b28fd19f am: ef155a6c am: d5d27c5e

Change-Id: Ic74e494e8eee350fcaf0fc2bbb8275e39312689a
parents 00885035 d5d27c5e

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

+3 −1
Original line number Original line Diff line number Diff line
@@ -922,8 +922,10 @@ public class Tethering { 
                    case WifiManager.WIFI_AP_STATE_ENABLED:

                    case WifiManager.WIFI_AP_STATE_ENABLED:

                        enableWifiIpServingLocked(ifname, ipmode);

                        enableWifiIpServingLocked(ifname, ipmode);

                        break;

                        break;

                    case WifiManager.WIFI_AP_STATE_DISABLED:

                    case WifiManager.WIFI_AP_STATE_DISABLING:

                    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:

                    case WifiManager.WIFI_AP_STATE_FAILED:

                    default:

                    default:

                        disableWifiIpServingLocked(ifname, curState);

                        disableWifiIpServingLocked(ifname, curState);