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

Change-Id: I98da412048dc0dbe100826809173763c70d7a15e
This commit is contained in:
TreeHugger Robot
2020-05-27 04:00:38 +00:00
committed by Automerger Merge Worker

View File

@@ -763,8 +763,13 @@ public class WifiSettings2 extends RestrictedSettingsFragment
LongPressWifiEntryPreference pref =
(LongPressWifiEntryPreference) getCachedPreference(key);
if (pref != null) {
pref.setOrder(index++);
continue;
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);