diff options
| author | Brandon McAnsh <brandon.mcansh@gmail.com> | 2015-06-05 15:36:41 -0400 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@cyanogenmod.org> | 2015-06-05 22:21:04 +0000 |
| commit | 7e6fd7d702ae13b751c502259ce044948c22b85c (patch) | |
| tree | 4f5e0658701e03b164eb11a8eee118ebb2600121 | |
| parent | 1b9d414c1c8d4fe7f1100a181bfd184307cdb09a (diff) | |
| download | android_packages_apps_Trebuchet-7e6fd7d702ae13b751c502259ce044948c22b85c.tar.gz android_packages_apps_Trebuchet-7e6fd7d702ae13b751c502259ce044948c22b85c.tar.bz2 android_packages_apps_Trebuchet-7e6fd7d702ae13b751c502259ce044948c22b85c.zip | |
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 <brandon.mcansh@gmail.com>
| -rw-r--r-- | src/com/android/launcher3/Launcher.java | 15 |
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); + } } } |