Merge "Create new WifiEntryPreference if WifiEntry object changes"

2020-05-21 05:22:39 +00:00
parent ab3ac85bc9 2547d0617c
commit bc92d48d3f
1 changed files with 7 additions and 2 deletions
--- a/src/com/android/settings/wifi/WifiSettings.java
+++ b/src/com/android/settings/wifi/WifiSettings.java
@@ -763,8 +763,13 @@ public class WifiSettings 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);