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

WifiSettings cleanup; emptyListi() instead of null

Browse Source 
Change-Id: I0fced1f00ff259aed98988f0913383c50a3c6427
This commit is contained in:
Isaac Levy
2011-08-26 14:20:14 -07:00
parent 6dbfdf3800
commit cc38b49392
1 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -513,11 +513,9 @@ public class WifiSettings extends SettingsPreferenceFragment
} }
boolean found = false; boolean found = false;
if (apMap.getAll(result.SSID) != null) { for (AccessPoint accessPoint : apMap.getAll(result.SSID)) {
for (AccessPoint accessPoint : apMap.getAll(result.SSID)) { if (accessPoint.update(result))
if (accessPoint.update(result)) found = true;
found = true;
}
} }
if (!found) { if (!found) {
AccessPoint accessPoint = new AccessPoint(getActivity(), result); AccessPoint accessPoint = new AccessPoint(getActivity(), result);
@@ -527,7 +525,7 @@ public class WifiSettings extends SettingsPreferenceFragment
} }
} }
// // Pre-sort accessPoints to speed preference insertion
Collections.sort(accessPoints); Collections.sort(accessPoints);
return accessPoints; return accessPoints;
} }
@@ -535,9 +533,10 @@ public class WifiSettings extends SettingsPreferenceFragment
/** A restricted multimap for use in constructAccessPoints */ /** A restricted multimap for use in constructAccessPoints */
private class Multimap<K,V> { private class Multimap<K,V> {
private HashMap<K,List<V>> store = new HashMap<K,List<V>>(); private HashMap<K,List<V>> store = new HashMap<K,List<V>>();
/** retrieve a possibly null list of values with key K */ /** retrieve a non-null list of values with key K */
List<V> getAll(K key) { List<V> getAll(K key) {
return store.get(key); List<V> values = store.get(key);
return values != null ? values : Collections.<V>emptyList();
} }
void put(K key, V val) { void put(K key, V val) {