commit c6c8fef3e90f84b26c3b8550ec6a1d668ca9200d
author Sunny Goyal <sunnygoyal@google.com> Wed Mar 04 09:51:18 2015 -0800
committer Sunny Goyal <sunnygoyal@google.com> Wed Mar 04 15:20:24 2015 -0800
tree 81f97bcf419444f09c0d7139aab96238e183a10e
parent e72f3d53f8c35b94aece6fafa6fd12cce9d09fe5

Clearing DB if necessary, when applying the default layout

Bug: 19574498
Change-Id: I34850d9a7f7316bcc2cb9fc8a5be57d2488c16a6

src/com/android/launcher3/LauncherProvider.java

diff --git a/src/com/android/launcher3/LauncherProvider.java b/src/com/android/launcher3/LauncherProvider.java
index 3888b70..1040b11 100644
--- a/src/com/android/launcher3/LauncherProvider.java
+++ b/src/com/android/launcher3/LauncherProvider.java
@@ -305,6 +305,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) {