am 2d86dfec: Fix launcher updating when all of an app\'s activities disappear.

Merge commit '2d86dfec5797bfd4fba78562032c14bd9b6cfa7a'

* commit '2d86dfec5797bfd4fba78562032c14bd9b6cfa7a':
  Fix launcher updating when all of an app's activities disappear.
This commit is contained in:
Dianne Hackborn 2010-07-26 13:19:38 -07:00 committed by Android Git Automerger
commit 13f011e352
1 changed files with 13 additions and 15 deletions

View File

@ -149,6 +149,17 @@ class AllAppsList {
modified.add(applicationInfo);
}
}
} else {
// Remove all data for this package.
for (int i = data.size() - 1; i >= 0; i--) {
final ApplicationInfo applicationInfo = data.get(i);
final ComponentName component = applicationInfo.intent.getComponent();
if (packageName.equals(component.getPackageName())) {
removed.add(applicationInfo);
mIconCache.remove(component);
data.remove(i);
}
}
}
}
@ -160,23 +171,10 @@ class AllAppsList {
final Intent mainIntent = new Intent(Intent.ACTION_MAIN, null);
mainIntent.addCategory(Intent.CATEGORY_LAUNCHER);
mainIntent.setPackage(packageName);
final List<ResolveInfo> apps = packageManager.queryIntentActivities(mainIntent, 0);
final List<ResolveInfo> matches = new ArrayList<ResolveInfo>();
if (apps != null) {
// Find all activities that match the packageName
int count = apps.size();
for (int i = 0; i < count; i++) {
final ResolveInfo info = apps.get(i);
final ActivityInfo activityInfo = info.activityInfo;
if (packageName.equals(activityInfo.packageName)) {
matches.add(info);
}
}
}
return matches;
return apps != null ? apps : new ArrayList<ResolveInfo>();
}
/**