Merge "handleAirplaneModeToggled cleanup" into jb-dev

Author: isheriff

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

@@ -376,7 +376,7 @@ public void handleMessage(Message msg) {
                     @Override
                     public void onReceive(Context context, Intent intent) {
                         mAirplaneModeOn.set(isAirplaneModeOn());
-                        handleAirplaneModeToggled();
+                        handleAirplaneModeToggled(mAirplaneModeOn.get());
                         updateWifiState();
                     }
                 },
@@ -484,10 +484,10 @@ private boolean shouldWifiBeEnabled() {
         }
     }
 
-    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 @@ private void handleWifiToggled(boolean enabled) {
         }
     }
 
-    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);