Merge "Move AccessPointPreference.generateApKey."
This commit is contained in:
committed by
Android (Google) Code Review
commit
f92b2773d3
@@ -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) {
|
||||||
|
@@ -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);
|
||||||
|
Reference in New Issue
Block a user