From 5efa92f95fc0b3a2fa1635bb1733e614bcd461bd Mon Sep 17 00:00:00 2001 From: Arc Wang Date: Thu, 9 Jan 2020 18:51:58 +0800 Subject: [PATCH] [Wi-Fi] Remove redundant code in WifiSettings2 WifiPickerTracker get WifiEntries at onStart, it's no meaning to getWifiEntry at WifiSettings2#onActivityCreated. Bug: 143328194 Test: manual Edit a Wi-Fi network by clicking context menu 'Modify', rotate the WiFiDialog and see if any thing wrong Change-Id: I9746879720b72723259e1b59e8b5e8bae183b8cc --- src/com/android/settings/wifi/WifiSettings2.java | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/src/com/android/settings/wifi/WifiSettings2.java b/src/com/android/settings/wifi/WifiSettings2.java index 5bedb705156..4dd51ed3fa6 100644 --- a/src/com/android/settings/wifi/WifiSettings2.java +++ b/src/com/android/settings/wifi/WifiSettings2.java @@ -326,18 +326,6 @@ public class WifiSettings2 extends RestrictedSettingsFragment if (savedInstanceState != null) { mDialogMode = savedInstanceState.getInt(SAVE_DIALOG_MODE); mDialogWifiEntryKey = savedInstanceState.getString(SAVE_DIALOG_WIFIENTRY_KEY); - - if (!TextUtils.isEmpty(mDialogWifiEntryKey)) { - List wifiEntries = mWifiPickerTracker.getWifiEntries(); - Optional matchedWifiEntry = wifiEntries.stream().filter(wifiEntry -> - TextUtils.equals(wifiEntry.getKey(), mDialogWifiEntryKey)).findAny(); - if (matchedWifiEntry.isPresent()) { - mDialogWifiEntry = matchedWifiEntry.get(); - } else { - throw new IllegalStateException("Failed to restore WifiEntry of key: " - + mDialogWifiEntryKey); - } - } } // If we're supposed to enable/disable the Next button based on our current connection