commit f0b8dacf1516e0d901c71109c906dc15ef855fc5
author Dan Sandler <dsandler@android.com> Tue Nov 19 12:21:25 2013 -0500
committer Dan Sandler <dsandler@android.com> Tue Nov 19 19:31:04 2013 +0000
tree 623e23570c2af9270a743ab83819d49e9e06a0bb
parent 540efef758eb3bcf3bafe2241a4e3652a0e22c56

Disable importing workspaces from Launcher2.

Bug: 9832552
Bug: 11761032
Change-Id: I4dfd16046e9d6d0d1d864dff4340b0ed13cc8b8f

src/com/android/launcher3/LauncherModel.java

diff --git a/src/com/android/launcher3/LauncherModel.java b/src/com/android/launcher3/LauncherModel.java
index c3d4666..6a6cb35 100644
--- a/src/com/android/launcher3/LauncherModel.java
+++ b/src/com/android/launcher3/LauncherModel.java
@@ -1636,7 +1636,9 @@
             LauncherAppState.getLauncherProvider().loadDefaultFavoritesIfNecessary(0);
 
             // Check if we need to do any upgrade-path logic
+            // (Includes having just imported default favorites)
             boolean loadedOldDb = LauncherAppState.getLauncherProvider().justLoadedOldDb();
+
             // Log to disk
             Launcher.addDumpLog(TAG, "11683562 -   loadedOldDb: " + loadedOldDb, true);