PawletOS/Lawnchair
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Removing remaining code around ENABLE_DATABASE_RESTORE

Browse Source 
ENABLE_DATABASE_RESTORE feature is already removed
Also migrating some tests from BackupRestoreTest to RestoreDbTaskTest

Bug: 270392706
Test: Presubmit
Flag: N/A
Change-Id: I71822bbc2232008b3d2b4b9fbed0db5d889591e4
This commit is contained in:
Sunny Goyal
2023-04-12 15:50:32 -07:00
parent bfb24c7706
commit eb27546cc3
9 changed files with 132 additions and 482 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/com/android/launcher3/model/GridBackupTable.java
+2 -118
View File
@@ -15,18 +15,12 @@
*/
package com.android.launcher3.model;
import static com.android.launcher3.LauncherSettings.Favorites.BACKUP_TABLE_NAME;
import static com.android.launcher3.provider.LauncherDbUtils.dropTable;
import static com.android.launcher3.provider.LauncherDbUtils.tableExists;
import android.content.ContentValues;
import android.content.Context;
import android.database.Cursor;
import android.database.sqlite.SQLiteDatabase;
import android.os.Process;
import android.util.Log;
import androidx.annotation.IntDef;
import com.android.launcher3.LauncherSettings.Favorites;
import com.android.launcher3.pm.UserCache;
@@ -36,50 +30,13 @@ import com.android.launcher3.pm.UserCache;
* within the same data base.
*/
public class GridBackupTable {
private static final String TAG = "GridBackupTable";
private static final int ID_PROPERTY = -1;
private static final String KEY_HOTSEAT_SIZE = Favorites.SCREEN;
private static final String KEY_GRID_X_SIZE = Favorites.SPANX;
private static final String KEY_GRID_Y_SIZE = Favorites.SPANY;
private static final String KEY_DB_VERSION = Favorites.RANK;
public static final int OPTION_REQUIRES_SANITIZATION = 1;
/** STATE_NOT_FOUND indicates backup doesn't exist in the db. */
private static final int STATE_NOT_FOUND = 0;
/**
* STATE_RAW indicates the backup has not yet been sanitized. This implies it might still
* posses app info that doesn't exist in the workspace and needed to be sanitized before
* put into use.
*/
private static final int STATE_RAW = 1;
/** STATE_SANITIZED indicates the backup has already been sanitized, thus can be used as-is. */
private static final int STATE_SANITIZED = 2;
private final Context mContext;
private final SQLiteDatabase mDb;
private final int mOldHotseatSize;
private final int mOldGridX;
private final int mOldGridY;
private int mRestoredHotseatSize;
private int mRestoredGridX;
private int mRestoredGridY;
@IntDef({STATE_NOT_FOUND, STATE_RAW, STATE_SANITIZED})
private @interface BackupState { }
public GridBackupTable(Context context, SQLiteDatabase db, int hotseatSize, int gridX,
int gridY) {
public GridBackupTable(Context context, SQLiteDatabase db) {
mContext = context;
mDb = db;
mOldHotseatSize = hotseatSize;
mOldGridX = gridX;
mOldGridY = gridY;
}
/**
@@ -89,7 +46,6 @@ public class GridBackupTable {
long profileId = UserCache.INSTANCE.get(mContext).getSerialNumberForUser(
Process.myUserHandle());
copyTable(mDb, Favorites.TABLE_NAME, tableName, profileId);
encodeDBProperties(0);
}
/**
@@ -114,78 +70,6 @@ public class GridBackupTable {
private static void copyTable(SQLiteDatabase db, String from, String to, long userSerial) {
dropTable(db, to);
Favorites.addTableToDb(db, userSerial, false, to);
db.execSQL("INSERT INTO " + to + " SELECT * FROM " + from + " where _id > " + ID_PROPERTY);
}
private void encodeDBProperties(int options) {
ContentValues values = new ContentValues();
values.put(Favorites._ID, ID_PROPERTY);
values.put(KEY_DB_VERSION, mDb.getVersion());
values.put(KEY_GRID_X_SIZE, mOldGridX);
values.put(KEY_GRID_Y_SIZE, mOldGridY);
values.put(KEY_HOTSEAT_SIZE, mOldHotseatSize);
values.put(Favorites.OPTIONS, options);
mDb.insert(BACKUP_TABLE_NAME, null, values);
}
/**
* Load DB properties from grid backup table.
*/
public @BackupState int loadDBProperties() {
try (Cursor c = mDb.query(BACKUP_TABLE_NAME, new String[] {
KEY_DB_VERSION, // 0
KEY_GRID_X_SIZE, // 1
KEY_GRID_Y_SIZE, // 2
KEY_HOTSEAT_SIZE, // 3
Favorites.OPTIONS}, // 4
"_id=" + ID_PROPERTY, null, null, null, null)) {
if (!c.moveToNext()) {
Log.e(TAG, "Meta data not found in backup table");
return STATE_NOT_FOUND;
}
if (!validateDBVersion(mDb.getVersion(), c.getInt(0))) {
return STATE_NOT_FOUND;
}
mRestoredGridX = c.getInt(1);
mRestoredGridY = c.getInt(2);
mRestoredHotseatSize = c.getInt(3);
boolean isSanitized = (c.getInt(4) & OPTION_REQUIRES_SANITIZATION) == 0;
return isSanitized ? STATE_SANITIZED : STATE_RAW;
}
}
/**
* Restore workspace from raw backup if available.
*/
public boolean restoreFromRawBackupIfAvailable(long oldProfileId) {
if (!tableExists(mDb, Favorites.BACKUP_TABLE_NAME)
|| loadDBProperties() != STATE_RAW
|| mOldHotseatSize != mRestoredHotseatSize
|| mOldGridX != mRestoredGridX
|| mOldGridY != mRestoredGridY) {
// skip restore if dimensions in backup table differs from current setup.
return false;
}
copyTable(mDb, Favorites.BACKUP_TABLE_NAME, Favorites.TABLE_NAME, oldProfileId);
Log.d(TAG, "Backup restored");
return true;
}
/**
* Performs a backup on the workspace layout.
*/
public void doBackup(long profileId, int options) {
copyTable(mDb, Favorites.TABLE_NAME, Favorites.BACKUP_TABLE_NAME, profileId);
encodeDBProperties(options);
}
private static boolean validateDBVersion(int expected, int actual) {
if (expected != actual) {
Log.e(TAG, String.format("Launcher.db version mismatch, expecting %d but %d was found",
expected, actual));
return false;
}
return true;
db.execSQL("INSERT INTO " + to + " SELECT * FROM " + from);
}
}