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

Commit f35dbb8a 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 (lost in merge)" into ics

parents 033d5c7a 535e5f3d

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

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

            }

        } else {

            if (airplane) {

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

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

                mPersistWifiState.set(WIFI_DISABLED_AIRPLANE_ON);

            } else {

                mPersistWifiState.set(WIFI_DISABLED);