summaryrefslogtreecommitdiffstats
path: root/src/com/android/launcher3/ShortcutInfo.java
diff options
context:
space:
mode:
authorSunny Goyal <sunnygoyal@google.com>2014-07-24 20:19:31 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-07-24 15:36:09 +0000
commit8df5bf8be3db6dacbe0459a85acb3809026550e4 (patch)
tree53f2773ca26d172d0d8683626e5a5682c841c83d /src/com/android/launcher3/ShortcutInfo.java
parent4e7fa8b5082fe7d6e25728ef4563e59ed1ae7aa7 (diff)
parent9623a9951acd3e2e7ceb4c8551e3bff4b35001dd (diff)
downloadandroid_packages_apps_Trebuchet-8df5bf8be3db6dacbe0459a85acb3809026550e4.tar.gz
android_packages_apps_Trebuchet-8df5bf8be3db6dacbe0459a85acb3809026550e4.tar.bz2
android_packages_apps_Trebuchet-8df5bf8be3db6dacbe0459a85acb3809026550e4.zip
Merge "Fixing restored icons sometimes dissapers." into ub-now-master
Diffstat (limited to 'src/com/android/launcher3/ShortcutInfo.java')
-rw-r--r--src/com/android/launcher3/ShortcutInfo.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/com/android/launcher3/ShortcutInfo.java b/src/com/android/launcher3/ShortcutInfo.java
index 2d37ea291..dc019b272 100644
--- a/src/com/android/launcher3/ShortcutInfo.java
+++ b/src/com/android/launcher3/ShortcutInfo.java
@@ -185,7 +185,8 @@ public class ShortcutInfo extends ItemInfo {
String titleStr = title != null ? title.toString() : null;
values.put(LauncherSettings.BaseLauncherColumns.TITLE, titleStr);
- String uri = intent != null ? intent.toUri(0) : null;
+ String uri = restoredIntent != null ? restoredIntent.toUri(0)
+ : (intent != null ? intent.toUri(0) : null);
values.put(LauncherSettings.BaseLauncherColumns.INTENT, uri);
if (customIcon) {