Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 26c4e23e authored by Pinyao Ting's avatar Pinyao Ting
Browse files

fix GridBackupTableTest in comply with grid size migration 

Bug: 154166808
Test: GridBackupTableTest
Change-Id: I7af35ceed7edb77ac0d9c443d7eccbcef19ae476
parent 219426f8

src/com/android/launcher3/LauncherProvider.java

+4 −12
Original line number Diff line number Diff line
@@ -406,12 +406,8 @@ public class LauncherProvider extends ContentProvider { 
                return result;

            }

            case LauncherSettings.Settings.METHOD_REFRESH_BACKUP_TABLE: {

                // TODO(pinyaoting): Update the behavior here.

                if (!MULTI_DB_GRID_MIRATION_ALGO.get()) {

                    mOpenHelper.mBackupTableExists =

                            tableExists(mOpenHelper.getReadableDatabase(),

                mOpenHelper.mBackupTableExists = tableExists(mOpenHelper.getReadableDatabase(),

                        Favorites.BACKUP_TABLE_NAME);

                }

                return null;

            }

            case LauncherSettings.Settings.METHOD_RESTORE_BACKUP_TABLE: {
@@ -451,12 +447,8 @@ public class LauncherProvider extends ContentProvider { 
    }



    private void onAddOrDeleteOp(SQLiteDatabase db) {

        if (MULTI_DB_GRID_MIRATION_ALGO.get()) {

            // TODO(pingyaoting): Implement the behavior here.

        } else {

        mOpenHelper.onAddOrDeleteOp(db);

    }

    }



    /**

     * Deletes any empty folder from the DB.
@@ -674,7 +666,7 @@ public class LauncherProvider extends ContentProvider { 
        }



        protected void onAddOrDeleteOp(SQLiteDatabase db) {

            if (!MULTI_DB_GRID_MIRATION_ALGO.get() && mBackupTableExists) {

            if (mBackupTableExists) {

                dropTable(db, Favorites.BACKUP_TABLE_NAME);

                mBackupTableExists = false;

            }