From 4c159412de379a3df4845aa47c5c3d29efdb5b53 Mon Sep 17 00:00:00 2001
From: Charlie Anderson <charlander@google.com>
Date: Wed, 14 Aug 2024 14:21:46 -0400
Subject: [PATCH] Use bugfix flag for archived broadcast extras

Bug: 322314760
Test: locally
Flag: com.android.launcher3.enable_first_screen_broadcast_archiving_extras
Change-Id: I9e3944d35a1cf2a17d1b5fcbf249ecf488265a93
---
 src/com/android/launcher3/model/LoaderTask.java | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/com/android/launcher3/model/LoaderTask.java b/src/com/android/launcher3/model/LoaderTask.java
index 269cb9f25a..605accf39c 100644
--- a/src/com/android/launcher3/model/LoaderTask.java
+++ b/src/com/android/launcher3/model/LoaderTask.java
@@ -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,