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

Merge "handleAirplaneModeToggled cleanup" into jb-dev

Browse Source
This commit is contained in:
Irfan Sheriff
2012-05-17 14:19:46 -07:00
committed by Android (Google) Code Review
parent ce66556a34 42d73bba66
commit f82e7693ca
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -376,7 +376,7 @@ public class WifiService extends IWifiManager.Stub {
@Override
public void onReceive(Context context, Intent intent) {
mAirplaneModeOn.set(isAirplaneModeOn());
handleAirplaneModeToggled();
handleAirplaneModeToggled(mAirplaneModeOn.get());
updateWifiState();
}
},
@@ -484,10 +484,10 @@ public class WifiService extends IWifiManager.Stub {
}
}
private void handleWifiToggled(boolean enabled) {
boolean airplane = mAirplaneModeOn.get() && isAirplaneToggleable();
if (enabled) {
if (airplane) {
private void handleWifiToggled(boolean wifiEnabled) {
boolean airplaneEnabled = mAirplaneModeOn.get() && isAirplaneToggleable();
if (wifiEnabled) {
if (airplaneEnabled) {
persistWifiState(WIFI_ENABLED_AIRPLANE_OVERRIDE);
} else {
persistWifiState(WIFI_ENABLED);
@@ -501,8 +501,8 @@ public class WifiService extends IWifiManager.Stub {
}
}
private void handleAirplaneModeToggled() {
if (mAirplaneModeOn.get()) {
private void handleAirplaneModeToggled(boolean airplaneEnabled) {
if (airplaneEnabled) {
// Wifi disabled due to airplane on
if (mWifiEnabled) {
persistWifiState(WIFI_DISABLED_AIRPLANE_ON);