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

Merge "Remember wifi disable due to airplane"

Browse Source
This commit is contained in:
Irfan Sheriff
2011-10-03 13:53:42 -07:00
committed by Android (Google) Code Review
parent be25ca2997 31b92e28a5
commit 774f9856d3
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -149,6 +149,8 @@ public class WifiService extends IWifiManager.Stub {
private static final int WIFI_ENABLED = 1;
/* Wifi enabled while in airplane mode */
private static final int WIFI_ENABLED_AIRPLANE_OVERRIDE = 2;
/* Wifi disabled due to airplane mode on */
private static final int WIFI_DISABLED_AIRPLANE_ON = 3;
private AtomicInteger mWifiState = new AtomicInteger(WIFI_DISABLED);
private AtomicBoolean mAirplaneModeOn = new AtomicBoolean(false);
@@ -478,14 +480,19 @@ public class WifiService extends IWifiManager.Stub {
private void persistWifiEnabled(boolean enabled) {
final ContentResolver cr = mContext.getContentResolver();
boolean airplane = mAirplaneModeOn.get() && isAirplaneToggleable();
if (enabled) {
if (isAirplaneModeOn() && isAirplaneToggleable()) {
if (airplane) {
mWifiState.set(WIFI_ENABLED_AIRPLANE_OVERRIDE);
} else {
mWifiState.set(WIFI_ENABLED);
}
} else {
mWifiState.set(WIFI_DISABLED);
if (airplane) {
mWifiState.set(WIFI_DISABLED_AIRPLANE_ON);
} else {
mWifiState.set(WIFI_DISABLED);
}
}
Settings.Secure.putInt(cr, Settings.Secure.WIFI_ON, mWifiState.get());
}