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

Change-Id: I26d740dfda098abe5be5cf90fc27d4f0a22dd704
2020-05-27 04:17:14 +00:00
parent daf783ef1b 6c0e4e9e48
commit 3ba8caae95
1 changed files with 7 additions and 2 deletions
--- a/src/com/android/settings/wifi/WifiSettings2.java
+++ b/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);