commit f6d5c6740299bba7cbc448330295406590d92d83
author Sunny Goyal <sunnygoyal@google.com> Tue Sep 03 11:24:14 2019 -0700
committer android-build-merger <android-build-merger@google.com> Tue Sep 03 11:24:14 2019 -0700
tree ab5c3d6522a45ba904b317efeaf1928e80c1c775
parent c2c4d8358ca0324ccd7c832a01df1cca515f4202
parent 71834aa1863b232a6fbfd199a08e5316dc789b9b

Merge "Fix bug where we incorrectly change the default profile id of the database." into ub-launcher3-qt-qpr1-dev am: a42681f6d2
am: 71834aa186

Change-Id: Id5169fab20896a5e24e8856b714edc1b5cc738ad

src/com/android/launcher3/provider/RestoreDbTask.java

diff --git a/src/com/android/launcher3/provider/RestoreDbTask.java b/src/com/android/launcher3/provider/RestoreDbTask.java
index 0a2d4e3..fb33551 100644
--- a/src/com/android/launcher3/provider/RestoreDbTask.java
+++ b/src/com/android/launcher3/provider/RestoreDbTask.java
@@ -172,12 +172,6 @@
         values.put(Favorites.PROFILE_ID, newProfileId);
         db.update(Favorites.TABLE_NAME, values, "profileId = ?",
                 new String[]{Long.toString(oldProfileId)});
-
-        // Change default value of the column.
-        db.execSQL("ALTER TABLE favorites RENAME TO favorites_old;");
-        Favorites.addTableToDb(db, newProfileId, false);
-        db.execSQL("INSERT INTO favorites SELECT * FROM favorites_old;");
-        dropTable(db, "favorites_old");
     }