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

am a79239b1: Merge change I2d844842 into eclair

Browse Source 
Merge commit 'a79239b102f7b9c83e31be7b3a47ab50459b6a4f' into eclair-mr2

* commit 'a79239b102f7b9c83e31be7b3a47ab50459b6a4f':
  Fix for NPE in #2248683
This commit is contained in:
Amith Yamasani
2009-11-11 19:20:33 -08:00
committed by Android Git Automerger
parent 554cd5eca3 a79239b102
commit eba00ec701
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/com/android/settings/ManageApplications.java
View File

@@ -1403,13 +1403,17 @@ public class ManageApplications extends ListActivity implements
} }
} else { } else {
final String prefixString = prefix.toString().toLowerCase(); final String prefixString = prefix.toString().toLowerCase();
final String spacePrefixString = " " + prefixString;
Map<String, String> newMap = new HashMap<String, String>(); Map<String, String> newMap = new HashMap<String, String>();
synchronized (mFilterLock) { synchronized (mFilterLock) {
Map<String, String> localMap = mFilterMap; Map<String, String> localMap = mFilterMap;
Set<String> keys = mFilterMap.keySet(); Set<String> keys = mFilterMap.keySet();
for (String key : keys) { for (String key : keys) {
String label = localMap.get(key); String label = localMap.get(key);
if (label.indexOf(prefixString) != -1) { if (label == null) continue;
label = label.toLowerCase();
if (label.startsWith(prefixString)
|| label.indexOf(spacePrefixString) != -1) {
newMap.put(key, label); newMap.put(key, label);
} }
} }
@@ -1895,6 +1899,9 @@ public class ManageApplications extends ListActivity implements
public final int compare(ApplicationInfo a, ApplicationInfo b) { public final int compare(ApplicationInfo a, ApplicationInfo b) {
AppInfo ainfo = mCache.getEntry(a.packageName); AppInfo ainfo = mCache.getEntry(a.packageName);
AppInfo binfo = mCache.getEntry(b.packageName); AppInfo binfo = mCache.getEntry(b.packageName);
// Check for null app names, to avoid NPE in rare cases
if (ainfo == null || ainfo.appName == null) return -1;
if (binfo == null || binfo.appName == null) return 1;
return sCollator.compare(ainfo.appName.toString(), binfo.appName.toString()); return sCollator.compare(ainfo.appName.toString(), binfo.appName.toString());
} }
} }