1 files changed, 9 insertions, 6 deletions
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index a8c7f146d..f09f20b2a 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -3080,12 +3080,15 @@ public class Launcher extends Activity
 
         // Start activities
         startAppShortcutOrInfoActivity(v);
-        String packageName = intent.getComponent().getPackageName();
-        LauncherApplication.getLauncherStats().sendAppLaunchEvent(LauncherStats.ORIGIN_HOMESCREEN,
-                packageName);
-        if (LauncherStats.SETTINGS_PACKAGE_NAME.equals(packageName)) {
-            LauncherApplication.getLauncherStats().sendSettingsOpenedEvent(
-                    LauncherStats.ORIGIN_HOMESCREEN);
+        final ComponentName componentName = intent.getComponent();
+        if (componentName != null) {
+            String packageName = componentName.getPackageName();
+            LauncherApplication.getLauncherStats().sendAppLaunchEvent(
+                    LauncherStats.ORIGIN_HOMESCREEN, packageName);
+            if (LauncherStats.SETTINGS_PACKAGE_NAME.equals(packageName)) {
+                LauncherApplication.getLauncherStats().sendSettingsOpenedEvent(
+                        LauncherStats.ORIGIN_HOMESCREEN);
+            }
         }
     }