commit cdbbab76e1e6e2819c16e0c2d3b528cf4ecd48c5
author Winson Chung <winsonc@google.com> Mon May 13 13:09:58 2013 -0700
committer Winson Chung <winsonc@google.com> Mon May 13 13:09:58 2013 -0700
tree aad48dd0327f2c095d5ed02dd24b9b63c2cbf4a4
parent 56d796a9b09725fc44714bc2216d6bc6c4746b95

Fixing NPE in Workspace.removeItemsByPackageName() (Bug 8942242)

Change-Id: I1f63e548caa4b00b7166db4a53307c80650d8907

src/com/android/launcher2/Workspace.java

diff --git a/src/com/android/launcher2/Workspace.java b/src/com/android/launcher2/Workspace.java
index ac4c3dd..c725296 100644
--- a/src/com/android/launcher2/Workspace.java
+++ b/src/com/android/launcher2/Workspace.java
@@ -3659,21 +3659,21 @@
                 if (tag instanceof ShortcutInfo) {
                     ShortcutInfo info = (ShortcutInfo) tag;
                     ComponentName cn = info.intent.getComponent();
-                    if (packageNames.contains(cn.getPackageName())) {
+                    if ((cn != null) && packageNames.contains(cn.getPackageName())) {
                         cns.add(cn);
                     }
                 } else if (tag instanceof FolderInfo) {
                     FolderInfo info = (FolderInfo) tag;
                     for (ShortcutInfo s : info.contents) {
                         ComponentName cn = s.intent.getComponent();
-                        if (packageNames.contains(cn.getPackageName())) {
+                        if ((cn != null) && packageNames.contains(cn.getPackageName())) {
                             cns.add(cn);
                         }
                     }
                 } else if (tag instanceof LauncherAppWidgetInfo) {
                     LauncherAppWidgetInfo info = (LauncherAppWidgetInfo) tag;
                     ComponentName cn = info.providerName;
-                    if (packageNames.contains(cn.getPackageName())) {
+                    if ((cn != null) && packageNames.contains(cn.getPackageName())) {
                         cns.add(cn);
                     }
                 }