From 452b4db5ce5206f050733a39fe95acad11617814 Mon Sep 17 00:00:00 2001
From: Winson Chung <winsonc@google.com>
Date: Sun, 6 May 2012 16:50:16 -0700
Subject: [PATCH] Fixing NPE in LauncherModel (Bug 6449627)

Change-Id: I6e0040465e6bf9f65ad7c05af1f7ef7cf948a355
---
 src/com/android/launcher2/LauncherModel.java | 2 +-
 src/com/android/launcher2/Workspace.java     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/com/android/launcher2/LauncherModel.java b/src/com/android/launcher2/LauncherModel.java
index ff4abc6b31..bae4c56fc0 100644
--- a/src/com/android/launcher2/LauncherModel.java
+++ b/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);
                 }
             }
diff --git a/src/com/android/launcher2/Workspace.java b/src/com/android/launcher2/Workspace.java
index e946095f74..456224f65f 100644
--- a/src/com/android/launcher2/Workspace.java
+++ b/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) {}