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

Commit 90bd9433 authored by Irfan Sheriff's avatar Irfan Sheriff Committed by Android Git Automerger
Browse files

am 9c50996b: Merge "Dont start wifi if in airplane mode" into froyo 

Merge commit '9c50996b' into froyo-plus-aosp

* commit '9c50996b':
  Dont start wifi if in airplane mode
parents 21f15f68 9c50996b

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

+4 −1
Original line number Diff line number Diff line
@@ -263,10 +263,13 @@ public class WifiService extends IWifiManager.Stub { 
    /**

     * Check if Wi-Fi needs to be enabled and start

     * if needed

     *

     * This function is used only at boot time

     */

    public void startWifi() {

        /* Start if Wi-Fi is enabled or the saved state indicates Wi-Fi was on */

        boolean wifiEnabled = getPersistedWifiEnabled() || testAndClearWifiSavedState();

        boolean wifiEnabled = !isAirplaneModeOn()

                && (getPersistedWifiEnabled() || testAndClearWifiSavedState());

        Slog.i(TAG, "WifiService starting up with Wi-Fi " +

                (wifiEnabled ? "enabled" : "disabled"));

        setWifiEnabled(wifiEnabled);