From 783be63c0a6d9b47f900c5d711a6a1663f1ca112 Mon Sep 17 00:00:00 2001 From: Adnan Date: Wed, 19 Nov 2014 15:52:17 -0800 Subject: Trebuchet: Fix migration from L to Trebuchet. Change-Id: Ide667f2bba1dcce2ff3d9a6b08e15bf9bf0ada34 --- src/com/android/launcher3/LauncherProvider.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/com/android/launcher3/LauncherProvider.java b/src/com/android/launcher3/LauncherProvider.java index 419505e09..f1b7d337c 100644 --- a/src/com/android/launcher3/LauncherProvider.java +++ b/src/com/android/launcher3/LauncherProvider.java @@ -959,17 +959,17 @@ public class LauncherProvider extends ContentProvider { } if (oldVersion < 21) { - //Check for column's existence, hackish way to make sure - //we can upgrade from Trebuchet and from Launcher3(new) + // Check for column's existence, hackish way to make sure + // we can upgrade from Trebuchet and from Launcher3(new) Cursor c = null; try { c = db.rawQuery("SELECT hidden FROM favorites", null); - //if we have don't have hidden, add it - if (c == null || (c != null && !c.moveToNext())) { - db.execSQL("ALTER TABLE favorites ADD hidden INTEGER DEFAULT 0"); - } else { - //otherwise, we don't have profiles + // if we have have hidden, add profiles + if (c != null) { addProfileColumn(db); + } else { + // otherwise, we don't have hidden, add it + db.execSQL("ALTER TABLE favorites ADD hidden INTEGER DEFAULT 0"); } } catch (SQLException e) { Log.e(TAG, e.getMessage(), e); -- cgit v1.2.3