Merge "Wifi: Restore hidden flag for hidden networks on update network" am: 0138575b8d am: e1c58570d6

am: 935ce87d32

Change-Id: I4ad47e788c1ab591dc82a031ef22dadc65bf8582

src/com/android/settings/wifi/WifiConfigController.java

@@ -517,6 +517,7 @@ public class WifiConfigController implements TextWatcher,
                     mAccessPoint.getSsidStr());
         } else {
             config.networkId = mAccessPoint.getConfig().networkId;
+            config.hiddenSSID = mAccessPoint.getConfig().hiddenSSID;
         }
 
         config.shared = mSharedCheckBox.isChecked();