Merge "Fixing NPE in LauncherModel (Bug 6449627)" into jb-dev

This commit is contained in:
Winson Chung authored and Android (Google) Code Review committed 2012-05-06 17:02:07 -07:00
commit 3ed802de77
2 files changed
+2 -2

No files matched your search

+1 -1
View File
@@ -1684,7 +1684,7 @@ public class LauncherModel extends BroadcastReceiver {
for (ItemInfo i : sWorkspaceItems) {
if (i instanceof ShortcutInfo) {
ShortcutInfo info = (ShortcutInfo) i;
if (info.intent.getPackage().equals(packageName)) {
if (info.intent.getComponent().getPackageName().equals(packageName)) {
infos.add(info);
}
}
+1 -1
View File
@@ -3708,7 +3708,7 @@ public class Workspace extends SmoothPagedView
for (String intentStr : newApps) {
try {
Intent intent = Intent.parseUri(intentStr, 0);
if (packageNames.contains(intent.getPackage())) {
if (packageNames.contains(intent.getComponent().getPackageName())) {
newApps.remove(intentStr);
}
} catch (URISyntaxException e) {}