Merge "Create new WifiEntryPreference if WifiEntry object changes" into rvc-dev am: 6d93851386 am: 6c0e4e9e48

Change-Id: Ibbf5efba18de6266f64a822dc022ede299c5ac60

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

@@ -763,8 +763,13 @@ public class WifiSettings2 extends RestrictedSettingsFragment
             LongPressWifiEntryPreference pref =
                     (LongPressWifiEntryPreference) getCachedPreference(key);
             if (pref != null) {
+                if (pref.getWifiEntry() == wifiEntry) {
                     pref.setOrder(index++);
                     continue;
+                } else {
+                    // Create a new preference if the underlying WifiEntry object has changed
+                    removePreference(key);
+                }
             }
 
             pref = createLongPressWifiEntryPreference(wifiEntry);