summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdam Cohen <adamcohen@google.com>2014-04-11 01:14:55 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-04-11 01:14:56 +0000
commit8ac896b8c84066c109c2c4b97805f36270636121 (patch)
tree61ce56cf42c01434ab16e5c4e0f17c1da44b1521
parent6a641a569987f5edd725cb2dea6a992751cfbfbe (diff)
parenta7946070dc2e4ff43fe7e7c882c6bbea050a871f (diff)
downloadandroid_packages_apps_Trebuchet-8ac896b8c84066c109c2c4b97805f36270636121.tar.gz
android_packages_apps_Trebuchet-8ac896b8c84066c109c2c4b97805f36270636121.tar.bz2
android_packages_apps_Trebuchet-8ac896b8c84066c109c2c4b97805f36270636121.zip
Merge "Fix serious data loss issue for folders and hotseat items" into ub-now-mister-ugly
-rw-r--r--src/com/android/launcher3/LauncherProvider.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/com/android/launcher3/LauncherProvider.java b/src/com/android/launcher3/LauncherProvider.java
index fa3a75299..ad43cba48 100644
--- a/src/com/android/launcher3/LauncherProvider.java
+++ b/src/com/android/launcher3/LauncherProvider.java
@@ -804,7 +804,9 @@ public class LauncherProvider extends ContentProvider {
// which no longer exist. Since this can cause other problems, and since the user
// will never see these items anyway, we use database upgrade as an opportunity to
// clean things up.
- removeOrphanedItems(db);
+
+ // TODO: this needs to be fixed, currently causes data loss.
+ //removeOrphanedItems(db);
version = 18;
}