Merge "Use bugfix flag for archived broadcast extras" into main

2024-08-23 20:07:06 +00:00
parent 8d18757f77 4c159412de
commit 19b9344636
1 changed files with 4 additions and 1 deletions
@@ -209,7 +209,10 @@ public class LoaderTask implements Runnable {
                mApp.getContext().getContentResolver(),
                "launcher_broadcast_installed_apps",
                /* def= */ 0);
-        if (launcherBroadcastInstalledApps == 1 && mIsRestoreFromBackup) {
+        boolean shouldAttachArchivingExtras = mIsRestoreFromBackup
+                && (launcherBroadcastInstalledApps == 1
+                        || Flags.enableFirstScreenBroadcastArchivingExtras());
+        if (shouldAttachArchivingExtras) {
            List<FirstScreenBroadcastModel> broadcastModels =
                    FirstScreenBroadcastHelper.createModelsForFirstScreenBroadcast(
                            mPmHelper,