Merge "Move AccessPointPreference.generateApKey."

This commit is contained in:
TreeHugger Robot
2018-01-29 22:40:43 +00:00
committed by Android (Google) Code Review
2 changed files with 2 additions and 2 deletions

View File

@@ -161,7 +161,7 @@ public class SavedAccessPointsWifiSettings extends SettingsPreferenceFragment
final int accessPointsSize = accessPoints.size(); final int accessPointsSize = accessPoints.size();
for (int i = 0; i < accessPointsSize; ++i) { for (int i = 0; i < accessPointsSize; ++i) {
AccessPoint ap = accessPoints.get(i); AccessPoint ap = accessPoints.get(i);
String key = AccessPointPreference.generatePreferenceKey(ap); String key = ap.getKey();
LongPressAccessPointPreference preference = LongPressAccessPointPreference preference =
(LongPressAccessPointPreference) getCachedPreference(key); (LongPressAccessPointPreference) getCachedPreference(key);
if (preference == null) { if (preference == null) {

View File

@@ -777,7 +777,7 @@ public class WifiSettings extends RestrictedSettingsFragment
AccessPoint accessPoint = accessPoints.get(index); AccessPoint accessPoint = accessPoints.get(index);
// Ignore access points that are out of range. // Ignore access points that are out of range.
if (accessPoint.isReachable()) { if (accessPoint.isReachable()) {
String key = AccessPointPreference.generatePreferenceKey(accessPoint); String key = accessPoint.getKey();
hasAvailableAccessPoints = true; hasAvailableAccessPoints = true;
LongPressAccessPointPreference pref = LongPressAccessPointPreference pref =
(LongPressAccessPointPreference) getCachedPreference(key); (LongPressAccessPointPreference) getCachedPreference(key);