From 42d73bba668aea978259e574675f37ede80dd34e Mon Sep 17 00:00:00 2001
From: Irfan Sheriff <isheriff@google.com>
Date: Thu, 17 May 2012 14:14:44 -0700
Subject: [PATCH] handleAirplaneModeToggled cleanup

Addressing a cosmetic comment from the previous CL

Bug: 6504534
Change-Id: I04981f8b541611cb93110e8b88cd7751027060cc
---
 services/java/com/android/server/WifiService.java | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/services/java/com/android/server/WifiService.java b/services/java/com/android/server/WifiService.java
index 0acf776fd2342..dd037df672878 100644
--- a/services/java/com/android/server/WifiService.java
+++ b/services/java/com/android/server/WifiService.java
@@ -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);