am 599221c7: wifi: Update the AccessPointState network ID after saving configuration.

Merge commit '599221c7bbd6cd613fd4f86805ccaf0696a3e78c'

* commit '599221c7bbd6cd613fd4f86805ccaf0696a3e78c':
  wifi: Update the AccessPointState network ID after saving configuration.

diff --git a/src/com/android/settings/wifi/WifiLayer.java b/src/com/android/settings/wifi/WifiLayer.java
index 5bcf81f..ce518e1 100644 (file)
--- a/src/com/android/settings/wifi/WifiLayer.java
+++ b/src/com/android/settings/wifi/WifiLayer.java
@@ -423,6 +423,17 @@ public class WifiLayer {
         }
         
         /*
+         * It's necessary to update the network id of this state because the network id
+         * could have changed after the configuration is saved. For example, if there are
+         * more than 10 saved open-networks, some older open-networks will have been be forgotten.
+         */
+        state.setNetworkId(AccessPointState.NETWORK_ID_ANY);
+        config = findConfiguredNetwork(state);
+        if (config != null) {
+            state.setNetworkId(config.networkId);
+        }
+
+        /*
          * We could reload the configured networks, but instead just shortcut
          * and add this state to our list in memory
          */