summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorcretin45 <cretin45@gmail.com>2016-01-08 12:18:29 -0800
committerGerrit Code Review <gerrit@cyanogenmod.org>2016-01-08 12:20:30 -0800
commit7eb751210a21174e8fccbe231bea0e5e351288cb (patch)
treec94b6e298e203f74d60d7bbd5a0089009f43f843 /src
parentba04b03e492f1ce0e42a59c0e5bc782d64fa47e8 (diff)
downloadandroid_packages_apps_Trebuchet-7eb751210a21174e8fccbe231bea0e5e351288cb.tar.gz
android_packages_apps_Trebuchet-7eb751210a21174e8fccbe231bea0e5e351288cb.tar.bz2
android_packages_apps_Trebuchet-7eb751210a21174e8fccbe231bea0e5e351288cb.zip
Trebuchet: Don't crash on widget clicks
Issue-id: NIGHTLIES-2266 Change-Id: I804614c4d4636f58374c8f5d3e6252fbcd40ae29
Diffstat (limited to 'src')
-rw-r--r--src/com/android/launcher3/Launcher.java16
1 files changed, 10 insertions, 6 deletions
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index 169be38b5..b9acd5a96 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -3023,12 +3023,16 @@ 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);
+ ComponentName componentName = intent.getComponent();
+ if (componentName != null) {
+ 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);
+ }
}
if (mLauncherCallbacks != null) {