diff options
| author | Winson Chung <winsonc@google.com> | 2013-05-13 13:09:58 -0700 |
|---|---|---|
| committer | Winson Chung <winsonc@google.com> | 2013-05-13 13:09:58 -0700 |
| commit | cdbbab76e1e6e2819c16e0c2d3b528cf4ecd48c5 (patch) | |
| tree | aad48dd0327f2c095d5ed02dd24b9b63c2cbf4a4 /src | |
| parent | 56d796a9b09725fc44714bc2216d6bc6c4746b95 (diff) | |
| download | android_packages_apps_Trebuchet-cdbbab76e1e6e2819c16e0c2d3b528cf4ecd48c5.tar.gz android_packages_apps_Trebuchet-cdbbab76e1e6e2819c16e0c2d3b528cf4ecd48c5.tar.bz2 android_packages_apps_Trebuchet-cdbbab76e1e6e2819c16e0c2d3b528cf4ecd48c5.zip | |
Fixing NPE in Workspace.removeItemsByPackageName() (Bug 8942242)
Change-Id: I1f63e548caa4b00b7166db4a53307c80650d8907
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/launcher2/Workspace.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/com/android/launcher2/Workspace.java b/src/com/android/launcher2/Workspace.java index ac4c3ddb4..c7252960d 100644 --- a/src/com/android/launcher2/Workspace.java +++ b/src/com/android/launcher2/Workspace.java @@ -3659,21 +3659,21 @@ public class Workspace extends SmoothPagedView 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); } } |