PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix Wi-Fi list adds same AP repeatedly" into oc-dr1-dev

Browse Source 
am: 9638e020e5

Change-Id: I4c947cddb3ee000bc51dd8ea2f9eefbc54927824
This commit is contained in:
Shunta Sato
2017-06-29 20:38:03 +00:00
committed by android-build-merger
parent cf57e17791 9638e020e5
commit 97419f8d52
2 changed files with 62 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/com/android/settings/wifi/WifiSettings.java
View File

@@ -735,10 +735,7 @@ public class WifiSettings extends RestrictedSettingsFragment
AccessPoint accessPoint = accessPoints.get(index);
// Ignore access points that are out of range.
if (accessPoint.isReachable()) {
String key = accessPoint.getBssid();
if (TextUtils.isEmpty(key)) {
key = accessPoint.getSsidStr();
}
String key = generateKey(accessPoint);
hasAvailableAccessPoints = true;
LongPressAccessPointPreference pref =
(LongPressAccessPointPreference) getCachedPreference(key);
@@ -780,6 +777,18 @@ public class WifiSettings extends RestrictedSettingsFragment
}
}
private String generateKey(AccessPoint accessPoint) {
StringBuilder key = new StringBuilder();
String bssid = accessPoint.getBssid();
if (TextUtils.isEmpty(bssid)) {
key.append(accessPoint.getSsidStr());
} else {
key.append(bssid);
}
key.append(',').append(accessPoint.getSecurity());
return key.toString();
}
@NonNull
private LongPressAccessPointPreference createLongPressActionPointPreference(
AccessPoint accessPoint) {