diff options
| author | Jon Miranda <jonmiranda@google.com> | 2019-05-13 14:57:50 -0700 |
|---|---|---|
| committer | Jonathan Miranda <jonmiranda@google.com> | 2019-05-14 17:30:04 +0000 |
| commit | c7206caf6e6d6006bbc4909e140c6720e5c472d2 (patch) | |
| tree | deea6aeab4b08356b3e58f55696ad1c84119fd0e /src/com/android/launcher3/LauncherProvider.java | |
| parent | 512a3c59eaccb6cac505258ebfc2795904709d59 (diff) | |
| download | android_packages_apps_Trebuchet-c7206caf6e6d6006bbc4909e140c6720e5c472d2.tar.gz android_packages_apps_Trebuchet-c7206caf6e6d6006bbc4909e140c6720e5c472d2.tar.bz2 android_packages_apps_Trebuchet-c7206caf6e6d6006bbc4909e140c6720e5c472d2.zip | |
Ensure app widget ids are restored after database is sanitized.
Previously, it was possible for AppWidgetsRestoredReceiver to
start the restore process before work profile has finished restoring which
resulted in the work profile items being removed from the workspace.
Bug: 131315856
Change-Id: I2f295a1ca91f1996522bcc8052aa139979526e3b
Diffstat (limited to 'src/com/android/launcher3/LauncherProvider.java')
| -rw-r--r-- | src/com/android/launcher3/LauncherProvider.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/com/android/launcher3/LauncherProvider.java b/src/com/android/launcher3/LauncherProvider.java index f830301a3..6ad5c3684 100644 --- a/src/com/android/launcher3/LauncherProvider.java +++ b/src/com/android/launcher3/LauncherProvider.java @@ -158,7 +158,8 @@ public class LauncherProvider extends ContentProvider { mOpenHelper = new DatabaseHelper(getContext(), mListenerHandler); if (RestoreDbTask.isPending(getContext())) { - if (!RestoreDbTask.performRestore(mOpenHelper, new BackupManager(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 |