commit 68031ca3f920bdeb8472b41733af15e374255bf4
author Sunny Goyal <sunnygoyal@google.com> Mon Aug 02 12:23:44 2021 -0700
committer Sunny Goyal <sunnygoyal@google.com> Wed Aug 04 09:51:04 2021 -0700
tree 8671ea60ac533c097cf07cd5f7db44c0199df188
parent 9016e17988509705f9c3569fc668774e92640fa1

Storing form factor as part of backup and disabling restore if form-factor is different

Bug: 195301649
Test: Manual
Change-Id: I9a9c4bc9246f40af2209cb914b3966319bc78bff

src/com/android/launcher3/LauncherProvider.java

diff --git a/src/com/android/launcher3/LauncherProvider.java b/src/com/android/launcher3/LauncherProvider.java
index 95a8d81..49f20c6 100644
--- a/src/com/android/launcher3/LauncherProvider.java
+++ b/src/com/android/launcher3/LauncherProvider.java
@@ -151,15 +151,7 @@
             mOpenHelper = DatabaseHelper.createDatabaseHelper(
                     getContext(), false /* forMigration */);
 
-            if (RestoreDbTask.isPending(getContext())) {
-                if (!RestoreDbTask.performRestore(getContext(), mOpenHelper,
-                        new BackupManager(getContext()))) {
-                    mOpenHelper.createEmptyDB(mOpenHelper.getWritableDatabase());
-                }
-                // Set is pending to false irrespective of the result, so that it doesn't get
-                // executed again.
-                RestoreDbTask.setPending(getContext(), false);
-            }
+            RestoreDbTask.restoreIfNeeded(getContext(), mOpenHelper);
         }
     }