Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Merge commit '9c50996b175a1ee4b0069cba5163310c0189ac36' into froyo-plus-aosp

* commit '9c50996b175a1ee4b0069cba5163310c0189ac36':
  Dont start wifi if in airplane mode
This commit is contained in:
Irfan Sheriff
2010-04-02 12:51:05 -07:00
committed by Android Git Automerger
parent 21f15f68c2 9c50996b17
commit 90bd943364
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
services/java/com/android/server/WifiService.java
View File

@@ -263,10 +263,13 @@ public class WifiService extends IWifiManager.Stub {
/** /**
* Check if Wi-Fi needs to be enabled and start * Check if Wi-Fi needs to be enabled and start
* if needed * if needed
*
* This function is used only at boot time
*/ */
public void startWifi() { public void startWifi() {
/* Start if Wi-Fi is enabled or the saved state indicates Wi-Fi was on */ /* 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 " + Slog.i(TAG, "WifiService starting up with Wi-Fi " +
(wifiEnabled ? "enabled" : "disabled")); (wifiEnabled ? "enabled" : "disabled"));
setWifiEnabled(wifiEnabled); setWifiEnabled(wifiEnabled);