From 3e5cfe8f0ac32b932fe3b93cc784cd9b849dc118 Mon Sep 17 00:00:00 2001
From: Irfan Sheriff <isheriff@google.com>
Date: Mon, 22 Mar 2010 11:34:48 -0700
Subject: [PATCH] Update AP config status

Bug: 2533950
Change-Id: Idac1213b9dc44c073fa5cf8da00b8599161565f2
---
 src/com/android/settings/wifi/WifiApEnabler.java | 16 ++++++++++------
 .../android/settings/wifi/WifiApSettings.java    |  5 +++++
 2 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/src/com/android/settings/wifi/WifiApEnabler.java b/src/com/android/settings/wifi/WifiApEnabler.java
index 60496235b18..3d8d282ffee 100644
--- a/src/com/android/settings/wifi/WifiApEnabler.java
+++ b/src/com/android/settings/wifi/WifiApEnabler.java
@@ -107,6 +107,14 @@ public class WifiApEnabler implements Preference.OnPreferenceChangeListener {
         return false;
     }
 
+    void updateConfigSummary(WifiConfiguration wifiConfig) {
+        String s = mContext.getString(
+                com.android.internal.R.string.wifi_tether_configure_ssid_default);
+        mCheckBox.setSummary(String.format(
+                    mContext.getString(R.string.wifi_tether_enabled_subtext),
+                    (wifiConfig == null) ? s : wifiConfig.SSID));
+    }
+
     private void updateTetherState(Object[] available, Object[] tethered, Object[] errored) {
         boolean wifiTethered = false;
         boolean wifiErrored = false;
@@ -125,12 +133,8 @@ public class WifiApEnabler implements Preference.OnPreferenceChangeListener {
         }
 
         if (wifiTethered) {
-            WifiConfiguration mWifiConfig = mWifiManager.getWifiApConfiguration();
-            String s = mContext.getString(
-                    com.android.internal.R.string.wifi_tether_configure_ssid_default);
-            mCheckBox.setSummary(String.format(
-                    mContext.getString(R.string.wifi_tether_enabled_subtext),
-                    (mWifiConfig == null) ? s : mWifiConfig.SSID));
+            WifiConfiguration wifiConfig = mWifiManager.getWifiApConfiguration();
+            updateConfigSummary(wifiConfig);
         } else if (wifiErrored) {
             mCheckBox.setSummary(R.string.wifi_error);
         }
diff --git a/src/com/android/settings/wifi/WifiApSettings.java b/src/com/android/settings/wifi/WifiApSettings.java
index b8fb9043641..ec1016e9073 100644
--- a/src/com/android/settings/wifi/WifiApSettings.java
+++ b/src/com/android/settings/wifi/WifiApSettings.java
@@ -122,6 +122,11 @@ public class WifiApSettings extends PreferenceActivity
                                       mWifiConfig.SSID,
                                       mWifiConfig.allowedKeyManagement.get(KeyMgmt.WPA_PSK) ?
                                       mSecurityType[WPA_INDEX] : mSecurityType[OPEN_INDEX]));
+            /**
+             * There is no tether notification on changing AP
+             * configuration. Update status with new config.
+             */
+            mWifiApEnabler.updateConfigSummary(mWifiConfig);
         }
     }
 }