Executing the DB migration during startup instead of restore.

This allows proper execution of DB.onUpgrade task if the app updates
after the restore

Change-Id: I4c40167b30e1d7040b3a38be70d834f7b215e540

2 files changed, 6 insertions, 6 deletions

diff --git a/tests/src/com/android/launcher3/LauncherBackupAgentTest.java b/tests/src/com/android/launcher3/provider/RestoreDbTaskTest.java
index 020a557c7..29f738bab 100644
--- a/tests/src/com/android/launcher3/LauncherBackupAgentTest.java
+++ b/tests/src/com/android/launcher3/provider/RestoreDbTaskTest.java
@@ -1,4 +1,4 @@
-package com.android.launcher3;
+package com.android.launcher3.provider;
 
 import android.content.ContentValues;
 import android.database.Cursor;
@@ -10,14 +10,14 @@ import com.android.launcher3.LauncherProvider.DatabaseHelper;
 import com.android.launcher3.LauncherSettings.Favorites;
 
 /**
- * Tests for {@link LauncherBackupAgent}
+ * Tests for {@link RestoreDbTask}
  */
 @MediumTest
-public class LauncherBackupAgentTest extends AndroidTestCase {
+public class RestoreDbTaskTest extends AndroidTestCase {
 
     public void testGetProfileId() throws Exception {
         SQLiteDatabase db = new MyDatabaseHelper(23).getWritableDatabase();
-        assertEquals(23, new LauncherBackupAgent().getDefaultProfileId(db));
+        assertEquals(23, new RestoreDbTask().getDefaultProfileId(db));
     }
 
     public void testMigrateProfileId() throws Exception {
@@ -32,7 +32,7 @@ public class LauncherBackupAgentTest extends AndroidTestCase {
         // Verify item add
         assertEquals(5, getCount(db, "select * from favorites where profileId = 42"));
 
-        new LauncherBackupAgent().migrateProfileId(db, 33);
+        new RestoreDbTask().migrateProfileId(db, 33);
 
         // verify data migrated
         assertEquals(0, getCount(db, "select * from favorites where profileId = 42"));
diff --git a/tests/src/com/android/launcher3/util/TestLauncherProvider.java b/tests/src/com/android/launcher3/util/TestLauncherProvider.java
index bd3e86c8a..6ca212165 100644
--- a/tests/src/com/android/launcher3/util/TestLauncherProvider.java
+++ b/tests/src/com/android/launcher3/util/TestLauncherProvider.java
@@ -37,7 +37,7 @@ public class TestLauncherProvider extends LauncherProvider {
         }
 
         @Override
-        protected long getDefaultUserSerial() {
+        public long getDefaultUserSerial() {
             return 0;
         }