commit 354caf708760762eb5ff1cbddad21d38fd59bf2c
author Winson Chung <winsonc@google.com> Tue May 14 12:02:17 2013 -0700
committer Android Git Automerger <android-git-automerger@android.com> Tue May 14 12:02:17 2013 -0700
tree 309522f6ef0f203442091dd1e3334e544340a0c9
parent cd59767b567fc5c745eff1e0f5e7338bbbaf9ceb
parent 07381ae4e4a24466c6f2d81a3e6736c9fda5bb19

am 07381ae4: am cdbbab76: Fixing NPE in Workspace.removeItemsByPackageName() (Bug 8942242)

* commit '07381ae4e4a24466c6f2d81a3e6736c9fda5bb19':
  Fixing NPE in Workspace.removeItemsByPackageName() (Bug 8942242)

src/com/android/launcher2/Workspace.java

diff --git a/src/com/android/launcher2/Workspace.java b/src/com/android/launcher2/Workspace.java
index 905f928..24d5f88 100644
--- a/src/com/android/launcher2/Workspace.java
+++ b/src/com/android/launcher2/Workspace.java
@@ -3657,21 +3657,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);
                     }
                 }