From 7e6fd7d702ae13b751c502259ce044948c22b85c Mon Sep 17 00:00:00 2001 From: Brandon McAnsh Date: Fri, 5 Jun 2015 15:36:41 -0400 Subject: Launcher: Check if componentName is null prior to getPackageName() * If getComponent() of the intent is null, an NPE will be thrown Change-Id: I93e6335d89daa5dc7950ba5ea99a15d4162ce369 Signed-off-by: Brandon McAnsh --- src/com/android/launcher3/Launcher.java | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) (limited to 'src/com/android/launcher3/Launcher.java') 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); + } } } -- cgit v1.2.3