Merge "Fix issue with limiting access points"
This commit is contained in:
committed by
Android (Google) Code Review
commit
85ba10524b
@@ -451,6 +451,8 @@ public class WifiSettings extends SettingsPreferenceFragment
|
|||||||
// AccessPoints are automatically sorted with TreeSet.
|
// AccessPoints are automatically sorted with TreeSet.
|
||||||
final Collection<AccessPoint> accessPoints = constructAccessPoints();
|
final Collection<AccessPoint> accessPoints = constructAccessPoints();
|
||||||
|
|
||||||
|
if (mInXlSetupWizard) {
|
||||||
|
//limit access points on set up wizard
|
||||||
int count = MAX_MENU_COUNT_IN_XL;
|
int count = MAX_MENU_COUNT_IN_XL;
|
||||||
for (AccessPoint accessPoint : accessPoints) {
|
for (AccessPoint accessPoint : accessPoints) {
|
||||||
mAccessPoints.addPreference(accessPoint);
|
mAccessPoints.addPreference(accessPoint);
|
||||||
@@ -459,6 +461,11 @@ public class WifiSettings extends SettingsPreferenceFragment
|
|||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
} else {
|
||||||
|
for (AccessPoint accessPoint : accessPoints) {
|
||||||
|
mAccessPoints.addPreference(accessPoint);
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user