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

Commit ab97da4d authored by Steve Kondik's avatar Steve Kondik Committed by Gerrit Code Review
Browse files

Merge "WifiService: Fix wifi re-enabling after user exits airplane mode" into ics

parents 09a5f2aa 60d48280

services/java/com/android/server/WifiService.java

+2 −1
Original line number Diff line number Diff line
@@ -488,7 +488,8 @@ public class WifiService extends IWifiManager.Stub { 
                mWifiState.set(WIFI_ENABLED);

            }

        } else {

            if (airplane) {

            if (airplane && mWifiState.get() != WIFI_ENABLED_AIRPLANE_OVERRIDE) {

                // In this state, Wi-Fi will be re-enabled after airplane mode is off

                mWifiState.set(WIFI_DISABLED_AIRPLANE_ON);

            } else {

                mWifiState.set(WIFI_DISABLED);