Merge "Allow multiple hotseat restorations in single session" into ub-launcher3-rvc-qpr-dev am: 93802e2612

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/12193279

Change-Id: Ib5fcde5f6abb8acd6443806775de236c341178a8
This commit is contained in:
Samuel Fufa
2020-07-20 22:42:11 +00:00
committed by Automerger Merge Worker
@@ -30,7 +30,6 @@ import com.android.launcher3.provider.LauncherDbUtils;
*/
public class HotseatRestoreHelper {
private final Launcher mLauncher;
private boolean mBackupRestored = false;
HotseatRestoreHelper(Launcher context) {
mLauncher = context;
@@ -62,7 +61,6 @@ public class HotseatRestoreHelper {
* Finds and restores a previously saved snapshow of Favorites table
*/
public void restoreBackup() {
if (mBackupRestored) return;
MODEL_EXECUTOR.execute(() -> {
try (LauncherDbUtils.SQLiteTransaction transaction = (LauncherDbUtils.SQLiteTransaction)
LauncherSettings.Settings.call(
@@ -78,7 +76,6 @@ public class HotseatRestoreHelper {
idp.numRows);
backupTable.restoreFromCustomBackupTable(HYBRID_HOTSEAT_BACKUP_TABLE, true);
transaction.commit();
mBackupRestored = true;
mLauncher.getModel().forceReload();
}
});