am a1454529: Merge "Dont enable Wi-Fi if it\'s not toggleable in flight mode"

* commit 'a1454529c3eb6d0e87b254888abfea3bb714f7fe':
  Dont enable Wi-Fi if it's not toggleable in flight mode

src/com/android/settings/wifi/WifiEnabler.java

@@ -110,6 +110,7 @@ public class WifiEnabler implements CompoundButton.OnCheckedChangeListener  {
             Toast.makeText(mContext, R.string.wifi_in_airplane_mode, Toast.LENGTH_SHORT).show();
             // Reset switch to off. No infinite check/listenenr loop.
             buttonView.setChecked(false);
+            return;
         }
 
         // Disable tethering if enabling Wifi