summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRicardo Cerqueira <cyanogenmod@cerqueira.org>2013-01-26 17:25:36 +0000
committerRicardo Cerqueira <cyanogenmod@cerqueira.org>2013-01-26 17:25:36 +0000
commiteece34ea416210253e6339827c0bd463f399d9d8 (patch)
tree13d108157dcf210d137095063ac90379e95352be
parent8c2d3eea26c5c055d15c6cef023714ef99bee9d2 (diff)
downloadandroid_packages_apps_Trebuchet-eece34ea416210253e6339827c0bd463f399d9d8.tar.gz
android_packages_apps_Trebuchet-eece34ea416210253e6339827c0bd463f399d9d8.tar.bz2
android_packages_apps_Trebuchet-eece34ea416210253e6339827c0bd463f399d9d8.zip
ShortcutInfo: Don't assume all stringified items have a title
Changes to some activities (some removals due to missing apps or layout changes, for instance) result in icon updates for items without a title. Attempting to stringify the item object in order to log the update and assuming a title was present was resulting in a NPE Change-Id: I414bbb7feaf41d13a82c630a5652a3833b12a2fc
-rw-r--r--src/com/cyanogenmod/trebuchet/ShortcutInfo.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/com/cyanogenmod/trebuchet/ShortcutInfo.java b/src/com/cyanogenmod/trebuchet/ShortcutInfo.java
index b1db3ec35..9d5455cc8 100644
--- a/src/com/cyanogenmod/trebuchet/ShortcutInfo.java
+++ b/src/com/cyanogenmod/trebuchet/ShortcutInfo.java
@@ -175,7 +175,7 @@ class ShortcutInfo extends ItemInfo {
@Override
public String toString() {
- return "ShortcutInfo(title=" + title.toString() + "intent=" + intent + "id=" + this.id
+ return "ShortcutInfo(title=" + (title != null ? title.toString() : "unkown ") + "intent=" + intent + "id=" + this.id
+ " type=" + this.itemType + " container=" + this.container + " screen=" + screen
+ " cellX=" + cellX + " cellY=" + cellY + " spanX=" + spanX + " spanY=" + spanY
+ " dropPos=" + Arrays.toString(dropPos) + ")";