commit 323f47f8bf24d4d9ef5281377b287431efbeada9
author Sunny Goyal <sunnygoyal@google.com> Thu Mar 05 04:32:48 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Thu Mar 05 04:32:48 2015 +0000
tree db91ef2723e3cbb6e226ea475dd6aa0eb7f8306f
parent 0b0d9d40ee055e166235e0e68141a3c06f8d0e94
parent c6c8fef3e90f84b26c3b8550ec6a1d668ca9200d

am c6c8fef3: Clearing DB if necessary, when applying the default layout

* commit 'c6c8fef3e90f84b26c3b8550ec6a1d668ca9200d':
  Clearing DB if necessary, when applying the default layout

src/com/android/launcher3/LauncherProvider.java

diff --git a/src/com/android/launcher3/LauncherProvider.java b/src/com/android/launcher3/LauncherProvider.java
index b618444..747d7ef 100644
--- a/src/com/android/launcher3/LauncherProvider.java
+++ b/src/com/android/launcher3/LauncherProvider.java
@@ -297,6 +297,10 @@
             if (loader == null) {
                 loader = getDefaultLayoutParser();
             }
+
+            // There might be some partially restored DB items, due to buggy restore logic in
+            // previous versions of launcher.
+            createEmptyDB();
             // Populate favorites table with initial favorites
             if ((mOpenHelper.loadFavorites(mOpenHelper.getWritableDatabase(), loader) <= 0)
                     && usingExternallyProvidedLayout) {