Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f92b2773 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Move AccessPointPreference.generateApKey."

parents 7078e342 9c8e6fb6

src/com/android/settings/wifi/SavedAccessPointsWifiSettings.java

+1 −1
Original line number Diff line number Diff line
@@ -161,7 +161,7 @@ public class SavedAccessPointsWifiSettings extends SettingsPreferenceFragment 
        final int accessPointsSize = accessPoints.size();

        for (int i = 0; i < accessPointsSize; ++i) {

            AccessPoint ap = accessPoints.get(i);

            String key = AccessPointPreference.generatePreferenceKey(ap);

            String key = ap.getKey();

            LongPressAccessPointPreference preference =

                    (LongPressAccessPointPreference) getCachedPreference(key);

            if (preference == null) {

src/com/android/settings/wifi/WifiSettings.java

+1 −1
Original line number Diff line number Diff line
@@ -777,7 +777,7 @@ public class WifiSettings extends RestrictedSettingsFragment 
            AccessPoint accessPoint = accessPoints.get(index);

            // Ignore access points that are out of range.

            if (accessPoint.isReachable()) {

                String key = AccessPointPreference.generatePreferenceKey(accessPoint);

                String key = accessPoint.getKey();

                hasAvailableAccessPoints = true;

                LongPressAccessPointPreference pref =

                        (LongPressAccessPointPreference) getCachedPreference(key);