summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRicardo Cerqueira <cyanogenmod@cerqueira.org>2013-01-26 09:28:15 -0800
committerRicardo Cerqueira <cyanogenmod@cerqueira.org>2013-01-26 17:38:04 +0000
commit9889f4485e0ecfa2db5d3e1523d17832f008bc1b (patch)
tree280fad38f84d933399ae0e62f0620b423ad3cb6a
parent40851fac7e3e20ed554e5ef7832ad3bc6f4828bb (diff)
parenteece34ea416210253e6339827c0bd463f399d9d8 (diff)
downloadandroid_packages_apps_Trebuchet-9889f4485e0ecfa2db5d3e1523d17832f008bc1b.tar.gz
android_packages_apps_Trebuchet-9889f4485e0ecfa2db5d3e1523d17832f008bc1b.tar.bz2
android_packages_apps_Trebuchet-9889f4485e0ecfa2db5d3e1523d17832f008bc1b.zip
Merge "ShortcutInfo: Don't assume all stringified items have a title" into cm-10.1
Change-Id: I2bf5cee3b69c71cbfd021b8fbc6f59eb881cdbeb
-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..8f0d8d31b 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() : "unknown ") + "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) + ")";