summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWinson Chung <winsonc@google.com>2012-05-08 10:00:31 -0700
committerWinson Chung <winsonc@google.com>2012-05-08 10:00:50 -0700
commit33a0ad56c0970b5c60b6e4e207f24dcefd1fd3e8 (patch)
tree86be2e4a3f50a93a4d8a3c05edbeb7e6409e53f0
parentbec653ea44429bbe85fb334a8c8ba6520e3fa209 (diff)
downloadandroid_packages_apps_Trebuchet-33a0ad56c0970b5c60b6e4e207f24dcefd1fd3e8.tar.gz
android_packages_apps_Trebuchet-33a0ad56c0970b5c60b6e4e207f24dcefd1fd3e8.tar.bz2
android_packages_apps_Trebuchet-33a0ad56c0970b5c60b6e4e207f24dcefd1fd3e8.zip
Fixing NPE. (Bug 6460298)
Change-Id: I535cdcabb9121594b4a877839e8a0ef1c6b25af1
-rw-r--r--src/com/android/launcher2/ItemInfo.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/com/android/launcher2/ItemInfo.java b/src/com/android/launcher2/ItemInfo.java
index d34b87e39..dedc0f4f3 100644
--- a/src/com/android/launcher2/ItemInfo.java
+++ b/src/com/android/launcher2/ItemInfo.java
@@ -115,7 +115,7 @@ class ItemInfo {
static String getPackageName(Intent intent) {
if (intent != null) {
String packageName = intent.getPackage();
- if (packageName == null) {
+ if (packageName == null && intent.getComponent() != null) {
packageName = intent.getComponent().getPackageName();
}
if (packageName != null) {