diff options
| author | Danesh M <danesh@cyngn.com> | 2016-05-04 19:10:11 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@cyanogenmod.org> | 2016-05-05 18:02:34 -0700 |
| commit | 0ccd34c3688740f7bb89a8e08eeb540bb2023cd4 (patch) | |
| tree | eea165ddeb060c3188f361882f965d6b33bd5945 | |
| parent | f252c25166ab1585a2628ddbb962f0603165e5f4 (diff) | |
| download | packages_apps_Settings-0ccd34c3688740f7bb89a8e08eeb540bb2023cd4.zip packages_apps_Settings-0ccd34c3688740f7bb89a8e08eeb540bb2023cd4.tar.gz packages_apps_Settings-0ccd34c3688740f7bb89a8e08eeb540bb2023cd4.tar.bz2 | |
WifiSettings : Fix forgetting saved networks crash after rotation
FEIJ-310
Change-Id: If6e3e28025ae4eba0bf20d53c68b7d840f76ce6c
| -rw-r--r-- | src/com/android/settings/wifi/SavedAccessPointsWifiSettings.java | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/src/com/android/settings/wifi/SavedAccessPointsWifiSettings.java b/src/com/android/settings/wifi/SavedAccessPointsWifiSettings.java index a3140a1..e7166da 100644 --- a/src/com/android/settings/wifi/SavedAccessPointsWifiSettings.java +++ b/src/com/android/settings/wifi/SavedAccessPointsWifiSettings.java @@ -177,6 +177,8 @@ public class SavedAccessPointsWifiSettings extends RestrictedSettingsFragment if (savedInstanceState.containsKey(SAVE_DIALOG_ACCESS_POINT_STATE)) { mAccessPointSavedState = savedInstanceState.getBundle(SAVE_DIALOG_ACCESS_POINT_STATE); + mDlgAccessPoint = new AccessPoint(getActivity(), mAccessPointSavedState); + mSelectedAccessPoint = mDlgAccessPoint; } mPrioritiesOrderChanged = savedInstanceState.getBoolean( PRIORITIES_ORDER_CHANGED_STATE, false); @@ -270,8 +272,13 @@ public class SavedAccessPointsWifiSettings extends RestrictedSettingsFragment final int accessPointsSize = accessPoints.size(); for (int i = 0; i < accessPointsSize; ++i){ - AccessPointPreference preference = new AccessPointPreference(accessPoints.get(i), + AccessPoint accessPoint = accessPoints.get(i); + AccessPointPreference preference = new AccessPointPreference(accessPoint, context, mUserBadgeCache, true, true); + if (mSelectedAccessPoint != null && + mSelectedAccessPoint.getNetworkId() == accessPoint.getNetworkId()) { + mSelectedAccessPoint = accessPoint; + } preference.setOrder(i); preferenceScreen.addPreference(preference); } @@ -297,11 +304,6 @@ public class SavedAccessPointsWifiSettings extends RestrictedSettingsFragment public Dialog onCreateDialog(int dialogId) { switch (dialogId) { case WifiSettings.WIFI_DIALOG_ID: - if (mDlgAccessPoint == null) { // For re-launch from saved state - mDlgAccessPoint = new AccessPoint(getActivity(), mAccessPointSavedState); - // Reset the saved access point data - mAccessPointSavedState = null; - } mSelectedAccessPoint = mDlgAccessPoint; // Hide forget button if config editing is locked down |