From 2c10f078df335cd65d5d4bb44bba3809a9002a27 Mon Sep 17 00:00:00 2001
From: Stephen Chen <stewchen@google.com>
Date: Thu, 23 Feb 2017 19:39:09 -0800
Subject: [PATCH] Properly forget networks and refresh page in
 SavedAcessPointsWifiSettings.

The dialog access point rebuilt after fragment is destroyed (i.e.
orientation change) did not properly save selected Preference, and
caused NPE. Changed onForget to refresh preference list.

Bug: 35207121
Test: b/35322875 tracking bug for saved networks tests.
Change-Id: I81935c5a6e3efab4d4e3b6e7c2b150bacf06d7c1
---
 .../android/settings/wifi/SavedAccessPointsWifiSettings.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/com/android/settings/wifi/SavedAccessPointsWifiSettings.java b/src/com/android/settings/wifi/SavedAccessPointsWifiSettings.java
index 1ec4380b59e..72da2e98af6 100644
--- a/src/com/android/settings/wifi/SavedAccessPointsWifiSettings.java
+++ b/src/com/android/settings/wifi/SavedAccessPointsWifiSettings.java
@@ -182,8 +182,8 @@ public class SavedAccessPointsWifiSettings extends SettingsPreferenceFragment
     public void onForget(WifiDialog dialog) {
         if (mSelectedAccessPoint != null) {
             mWifiManager.forget(mSelectedAccessPoint.getConfig().networkId, null);
-            getPreferenceScreen().removePreference((Preference) mSelectedAccessPoint.getTag());
             mSelectedAccessPoint = null;
+            initPreferences();
         }
     }