Merge "Prevent brief flash of "Error" in hotspot status text" into oc-mr1-dev am: bc6dc5c20c

am: 151d5600b1 Change-Id: I60106dd55184e0ad48a216a71ab066849636ddb2
2017-09-14 03:39:01 +00:00
parent f7eae26ab4 151d5600b1
commit 514391ca82
2 changed files with 32 additions and 12 deletions
--- a/src/com/android/settings/wifi/tether/WifiTetherPreferenceController.java
+++ b/src/com/android/settings/wifi/tether/WifiTetherPreferenceController.java
@@ -138,6 +138,7 @@ public class WifiTetherPreferenceController extends AbstractPreferenceController

    private void handleWifiApStateChanged(int state, int reason) {
        switch (state) {
+            case WifiManager.WIFI_AP_STATE_ENABLING:
            case WifiManager.WIFI_AP_STATE_ENABLED:
                /**
                 * Summary on enable is handled by tether