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

am: bc6dc5c20c Change-Id: I64d32e5ac1724ff4c79f1ea4516fa83492a39377
2017-09-14 03:31:27 +00:00
parent 6f98ad5778 bc6dc5c20c
commit 151d5600b1
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
@@ -139,6 +139,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