commit cd2d94b2d19a5cf30adc45b138fe202a76a5f5f7
author Jason Monk <jmonk@google.com> Wed Jun 22 15:36:36 2016 +0000
committer android-build-merger <android-build-merger@google.com> Wed Jun 22 15:36:36 2016 +0000
tree 3d2292e010d89cde4216e7db859c10994b27db6e
parent 29e4b2bc305a23e76c7ad2498aab0b598ae0cd91
parent dbb5a0b9182c34d0d2c88cb4ff89edd06e31b1ff

Merge \"Fix tethering re-enable after edit.\" into nyc-dev
am: dbb5a0b918

Change-Id: Ia9f2e65710a94f314f8bb2b8ec875088c9ccc59f

src/com/android/settings/TetherSettings.java

diff --git a/src/com/android/settings/TetherSettings.java b/src/com/android/settings/TetherSettings.java
index e033f94..be73aab 100644
--- a/src/com/android/settings/TetherSettings.java
+++ b/src/com/android/settings/TetherSettings.java
@@ -280,6 +280,14 @@
                     Log.d(TAG, "Restarting WifiAp due to prior config change.");
                     startTethering(TETHERING_WIFI);
                 }
+            } else if (action.equals(WifiManager.WIFI_AP_STATE_CHANGED_ACTION)) {
+                int state = intent.getIntExtra(WifiManager.EXTRA_WIFI_AP_STATE, 0);
+                if (state == WifiManager.WIFI_AP_STATE_DISABLED
+                        && mRestartWifiApAfterConfigChange) {
+                    mRestartWifiApAfterConfigChange = false;
+                    Log.d(TAG, "Restarting WifiAp due to prior config change.");
+                    startTethering(TETHERING_WIFI);
+                }
             } else if (action.equals(Intent.ACTION_MEDIA_SHARED)) {
                 mMassStorageActive = true;
                 updateState();
@@ -331,6 +339,7 @@
         mMassStorageActive = Environment.MEDIA_SHARED.equals(Environment.getExternalStorageState());
         mTetherChangeReceiver = new TetherChangeReceiver();
         IntentFilter filter = new IntentFilter(ConnectivityManager.ACTION_TETHER_STATE_CHANGED);
+        filter.addAction(WifiManager.WIFI_AP_STATE_CHANGED_ACTION);
         Intent intent = activity.registerReceiver(mTetherChangeReceiver, filter);
 
         filter = new IntentFilter();