am 5bb4c94a: Merge "Don\'t remove content URI shortcuts during restore" into ub-now-porkchop

* commit '5bb4c94a175938dff8178d781a3a839cbdc142b1': Don't remove content URI shortcuts during restore
2014-09-05 15:34:42 +00:00
parent 7ee999a044 5bb4c94a17
commit 0cc5a6562a
1 changed files with 4 additions and 0 deletions
@@ -2035,6 +2035,10 @@ public class LauncherModel extends BroadcastReceiver
                                            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,