diff options
| -rw-r--r-- | src/com/android/settings/wifi/WifiConfigController.java | 1 | ||||
| -rw-r--r-- | src/com/android/settings/wifi/WifiSettings.java | 8 |
2 files changed, 5 insertions, 4 deletions
diff --git a/src/com/android/settings/wifi/WifiConfigController.java b/src/com/android/settings/wifi/WifiConfigController.java index 96bb5d6..fc2276a 100644 --- a/src/com/android/settings/wifi/WifiConfigController.java +++ b/src/com/android/settings/wifi/WifiConfigController.java @@ -300,7 +300,6 @@ public class WifiConfigController implements TextWatcher, } } - if (mEdit || (mAccessPoint.getState() == null && mAccessPoint.getLevel() != -1)){ mConfigUi.setCancelButton(res.getString(R.string.wifi_cancel)); }else{ diff --git a/src/com/android/settings/wifi/WifiSettings.java b/src/com/android/settings/wifi/WifiSettings.java index 0d8c5d8..5c0a656 100644 --- a/src/com/android/settings/wifi/WifiSettings.java +++ b/src/com/android/settings/wifi/WifiSettings.java @@ -345,10 +345,12 @@ public class WifiSettings extends RestrictedSettingsFragment } }; - if (savedInstanceState != null - && savedInstanceState.containsKey(SAVE_DIALOG_ACCESS_POINT_STATE)) { + if (savedInstanceState != null) { mDlgEdit = savedInstanceState.getBoolean(SAVE_DIALOG_EDIT_MODE); - mAccessPointSavedState = savedInstanceState.getBundle(SAVE_DIALOG_ACCESS_POINT_STATE); + if (savedInstanceState.containsKey(SAVE_DIALOG_ACCESS_POINT_STATE)) { + mAccessPointSavedState = + savedInstanceState.getBundle(SAVE_DIALOG_ACCESS_POINT_STATE); + } } // if we're supposed to enable/disable the Next button based on our current connection |