commit 060a48378f21a6b5836990a23178d02c94fccc60
author Adam Cohen <adamcohen@google.com> Tue Nov 26 19:57:09 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Nov 26 19:57:10 2013 +0000
tree 12dc324284c25ee8c2b423b25394c3c109d3a285
parent a6a296ba1ffba6c5b98e92f05254f0317f28290b
parent 37c717ffa626c6690ea45ba88e5dfc9bea39ed6e

Merge "Fix NPE in case where workspace is null because Launcher has been destroyed " into jb-ub-now-jolly-elf

src/com/android/launcher3/LauncherProvider.java

diff --git a/src/com/android/launcher3/LauncherProvider.java b/src/com/android/launcher3/LauncherProvider.java
index dbc1b1c..4eb30e7 100644
--- a/src/com/android/launcher3/LauncherProvider.java
+++ b/src/com/android/launcher3/LauncherProvider.java
@@ -72,7 +72,7 @@
     static final String AUTHORITY = ProviderConfig.AUTHORITY;
 
     // Should we attempt to load anything from the com.android.launcher2 provider?
-    static final boolean IMPORT_LAUNCHER2_DATABASE = true;
+    static final boolean IMPORT_LAUNCHER2_DATABASE = false;
 
     static final String TABLE_FAVORITES = "favorites";
     static final String TABLE_WORKSPACE_SCREENS = "workspaceScreens";