commit 8df5bf8be3db6dacbe0459a85acb3809026550e4
author Sunny Goyal <sunnygoyal@google.com> Thu Jul 24 20:19:31 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Jul 24 15:36:09 2014 +0000
tree 53f2773ca26d172d0d8683626e5a5682c841c83d
parent 4e7fa8b5082fe7d6e25728ef4563e59ed1ae7aa7
parent 9623a9951acd3e2e7ceb4c8551e3bff4b35001dd

Merge "Fixing restored icons sometimes dissapers." into ub-now-master

src/com/android/launcher3/ShortcutInfo.java

diff --git a/src/com/android/launcher3/ShortcutInfo.java b/src/com/android/launcher3/ShortcutInfo.java
index 2d37ea2..dc019b2 100644
--- a/src/com/android/launcher3/ShortcutInfo.java
+++ b/src/com/android/launcher3/ShortcutInfo.java
@@ -185,7 +185,8 @@
         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) {