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

Commit 6b32c0a2 authored by Irfan Sheriff's avatar Irfan Sheriff Committed by Android Git Automerger
Browse files

am 48ef378d: Merge "DO NOT MERGE Avoid wifi disable in a UNKNOWN state" into eclair 

Merge commit '48ef378d' into eclair-plus-aosp

* commit '48ef378d':
  DO NOT MERGE Avoid wifi disable in a UNKNOWN state
parents 8c48b4a5 48ef378d

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

+11 −0
Original line number Diff line number Diff line
@@ -329,6 +329,17 @@ public class WifiService extends IWifiManager.Stub { 
            return false;

        }



        /**

         * Multiple calls to unregisterReceiver() cause exception and a system crash.

         * This can happen if a supplicant is lost (or firmware crash occurs) and user indicates

         * disable wifi at the same time.

         * Avoid doing a disable when the current Wifi state is UNKNOWN

         * TODO: Handle driver load fail and supplicant lost as seperate states

         */

        if (mWifiState == WIFI_STATE_UNKNOWN && !enable) {

            return false;

        }



        setWifiEnabledState(enable ? WIFI_STATE_ENABLING : WIFI_STATE_DISABLING, uid);



        if (enable) {