summaryrefslogtreecommitdiffstats
path: root/src/com/cyanogenmod/trebuchet/Workspace.java
diff options
context:
space:
mode:
authornebkat <nebkat@teamhacksung.org>2012-12-26 23:22:05 +0000
committernebkat <nebkat@teamhacksung.org>2012-12-26 23:22:05 +0000
commit8901992c72caa891a396f557ee76f42f1d7fbe15 (patch)
treecf835060f0d3c1a6721a13076c55f46814bda348 /src/com/cyanogenmod/trebuchet/Workspace.java
parentfc8ea2ddf7badf18f1415865927c62a8e5be37e5 (diff)
downloadpackages_apps_trebuchet-8901992c72caa891a396f557ee76f42f1d7fbe15.zip
packages_apps_trebuchet-8901992c72caa891a396f557ee76f42f1d7fbe15.tar.gz
packages_apps_trebuchet-8901992c72caa891a396f557ee76f42f1d7fbe15.tar.bz2
Fixes
Change-Id: I0778017cc8a7afc169fa72ebbee25ba2bdeefc60
Diffstat (limited to 'src/com/cyanogenmod/trebuchet/Workspace.java')
-rw-r--r--src/com/cyanogenmod/trebuchet/Workspace.java9
1 files changed, 6 insertions, 3 deletions
diff --git a/src/com/cyanogenmod/trebuchet/Workspace.java b/src/com/cyanogenmod/trebuchet/Workspace.java
index 32062e6..c7d6e75 100644
--- a/src/com/cyanogenmod/trebuchet/Workspace.java
+++ b/src/com/cyanogenmod/trebuchet/Workspace.java
@@ -4349,9 +4349,12 @@ public class Workspace extends PagedView
// return null for some shortcuts (for instance, for shortcuts to
// web pages.)
final Intent intent = info.intent;
- final ComponentName name = intent.getComponent();
- if (info.itemType == LauncherSettings.Favorites.ITEM_TYPE_APPLICATION &&
- Intent.ACTION_MAIN.equals(intent.getAction()) && name != null) {
+ if (intent != null && info.itemType == LauncherSettings.Favorites.ITEM_TYPE_APPLICATION &&
+ Intent.ACTION_MAIN.equals(intent.getAction())) {
+ final ComponentName name = intent.getComponent();
+ if (name == null) {
+ continue;
+ }
for (ApplicationInfo app : apps) {
if (app.componentName.equals(name)) {
BubbleTextView shortcut = (BubbleTextView) view;