commit 19b9344636208d32e2fac14bb0a2de8f09cd020c
author Charlie Anderson <charlander@google.com> Fri Aug 23 20:07:06 2024 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Aug 23 20:07:06 2024 +0000
tree e41468cba6d842df21cdd0bdc93d9abc5f907219
parent 8d18757f77f5435d06eaa865607cd07d3e734fc2
parent 4c159412de379a3df4845aa47c5c3d29efdb5b53

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

src/com/android/launcher3/model/LoaderTask.java

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