commit 5bb4c94a175938dff8178d781a3a839cbdc142b1
author Sunny Goyal <sunnygoyal@google.com> Fri Sep 05 14:58:26 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Sep 05 14:58:27 2014 +0000
tree fe1093e354685551e028d5fd0dbd97ffa1223d8f
parent 9b8da88ebaf0521d380fd1dcc0a473c71edc7ca0
parent 938a53d8640ddec14b36b1e7ddc3e156824d9de0

Merge "Don't remove content URI shortcuts during restore" into ub-now-porkchop

src/com/android/launcher3/LauncherModel.java

diff --git a/src/com/android/launcher3/LauncherModel.java b/src/com/android/launcher3/LauncherModel.java
index b44433d..616e536 100644
--- a/src/com/android/launcher3/LauncherModel.java
+++ b/src/com/android/launcher3/LauncherModel.java
@@ -2035,6 +2035,10 @@
                                             allowMissingTarget = true;
                                             // Add the icon on the workspace anyway.
                                         }
+                                    } else if (cn == null) {
+                                        // For shortcuts with no component, keep them as they are
+                                        restoredRows.add(id);
+                                        restored = false;
                                     }
                                 } catch (URISyntaxException e) {
                                     Launcher.addDumpLog(TAG,