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

src/com/android/launcher2/LauncherModel.java

@@ -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);
                 }
             }

src/com/android/launcher2/Workspace.java

@@ -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) {}