Merge "Remove logs for resolved bug, and make some logs permanent" into main (fdc5b21f) · Commits · e / os / BlissLauncher3

src/com/android/launcher3/model/GridSizeMigrationDBController.java

+3 −7

Original line number	Diff line number	Diff line
		@@ -86,6 +86,9 @@ public class GridSizeMigrationDBController {
		if (needsToMigrate) {
		Log.i(TAG, "Migration is needed. destDeviceState: " + destDeviceState
		+ ", srcDeviceState: " + srcDeviceState);
		} else {
		Log.i(TAG, "Migration is not needed. destDeviceState: " + destDeviceState
		+ ", srcDeviceState: " + srcDeviceState);
		}
		return needsToMigrate;
		}
		@@ -118,13 +121,7 @@ public class GridSizeMigrationDBController {
		@NonNull DatabaseHelper target,
		@NonNull SQLiteDatabase source) {

		Log.i("b/360462379", "Going from " + srcDeviceState.getColumns() + "x"
		+ srcDeviceState.getRows());
		Log.i("b/360462379", "Going to " + destDeviceState.getColumns() + "x"
		+ destDeviceState.getRows());

		if (!needsToMigrate(srcDeviceState, destDeviceState)) {
		Log.i("b/360462379", "Does not need to migrate.");
		return true;
		}

		@@ -132,7 +129,6 @@ public class GridSizeMigrationDBController {
		&& Flags.enableGridMigrationFix()
		&& srcDeviceState.getColumns().equals(destDeviceState.getColumns())
		&& srcDeviceState.getRows() < destDeviceState.getRows()) {
		Log.i("b/360462379", "Grid migration fix entry point.");
		// Only use this strategy when comparing the previous grid to the new grid and the
		// columns are the same and the destination has more rows
		copyTable(source, TABLE_NAME, target.getWritableDatabase(), TABLE_NAME, context);