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

* commit '5d3ef5715c43ca9c3c969deaf25c76a7d3e27624': Dont enable Wi-Fi if it's not toggleable in flight mode
2013-06-28 08:08:17 -07:00
parent 29bed78df6 5d3ef5715c
commit 50702355f2
1 changed files with 1 additions and 0 deletions
--- a/src/com/android/settings/wifi/WifiEnabler.java
+++ b/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