diff options
| author | Winson Chung <winsonc@google.com> | 2013-05-13 13:09:58 -0700 |
|---|---|---|
| committer | Steve Kondik <shade@chemlab.org> | 2013-08-17 02:35:26 -0700 |
| commit | f2147c1591b63dcf1f727cf81c70bb79dcf26959 (patch) | |
| tree | 7720a6cedb5bf93ec063e93b3ccf5c75a3e6b101 /src/com | |
| parent | c66541779a468736ef22eb7a9602fea10913584b (diff) | |
| download | android_packages_apps_Trebuchet-f2147c1591b63dcf1f727cf81c70bb79dcf26959.tar.gz android_packages_apps_Trebuchet-f2147c1591b63dcf1f727cf81c70bb79dcf26959.tar.bz2 android_packages_apps_Trebuchet-f2147c1591b63dcf1f727cf81c70bb79dcf26959.zip | |
Fixing NPE in Workspace.removeItemsByPackageName() (Bug 8942242)
Change-Id: I1f63e548caa4b00b7166db4a53307c80650d8907
Diffstat (limited to 'src/com')
| -rw-r--r-- | src/com/cyanogenmod/trebuchet/Workspace.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/com/cyanogenmod/trebuchet/Workspace.java b/src/com/cyanogenmod/trebuchet/Workspace.java index 453859b5b..26267415c 100644 --- a/src/com/cyanogenmod/trebuchet/Workspace.java +++ b/src/com/cyanogenmod/trebuchet/Workspace.java @@ -4350,21 +4350,21 @@ public class Workspace extends PagedView 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); } } |