Merge "Only start tether when not already enabled" into pi-dev am: f62f91b0b6

am: 964d107491 Change-Id: I0d325498e2ea8526fbc4e6ec4bf579331bf0848b
2018-04-26 14:30:25 -07:00
parent 0d3322a57b 964d107491
commit 60c513d908
2 changed files with 27 additions and 6 deletions
--- a/src/com/android/settings/wifi/tether/WifiTetherSwitchBarController.java
+++ b/src/com/android/settings/wifi/tether/WifiTetherSwitchBarController.java
@@ -91,10 +91,10 @@ public class WifiTetherSwitchBarController implements SwitchWidgetController.OnS

    @Override
    public boolean onSwitchToggled(boolean isChecked) {
-        if (isChecked) {
-            startTether();
-        } else {
+        if (!isChecked) {
            stopTether();
+        } else if (!mWifiManager.isWifiApEnabled()) {
+            startTether();
        }
        return true;
    }