From b739372438017e213a5db4b3af9d61974127afac Mon Sep 17 00:00:00 2001
From: Fengjiang Li <fengjial@google.com>
Date: Thu, 19 Oct 2023 13:52:35 -0700
Subject: [PATCH] Fix bug where we should not have changed when to log end of
 workspace binding in launche startup

In ag/25052869 we should only change when we end LAUNCHER_LATENCY_STARTUP_TOTAL_DURATION, but leave LAUNCHER_LATENCY_STARTUP_WORKSPACE_LOADER_SYNC/ASYNC unchanged.

Fix: 305243183
Test: lock screen, force stop launcher, verify COLD startup is logged before user unlocks screen
Flag: N/A
Change-Id: I206b7fcbe07fca99cdbcc3a53213550e6b8c7369
---
 src/com/android/launcher3/Launcher.java | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index 4e755dac88..351294f19f 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -2631,12 +2631,13 @@ public class Launcher extends StatefulActivity<LauncherState>
             Trace.endAsyncSection(DISPLAY_WORKSPACE_TRACE_METHOD_NAME,
                     DISPLAY_WORKSPACE_TRACE_COOKIE);
         }
+        mStartupLatencyLogger
+                .logCardinality(workspaceItemCount)
+                .logEnd(isBindSync
+                        ? LAUNCHER_LATENCY_STARTUP_WORKSPACE_LOADER_SYNC
+                        : LAUNCHER_LATENCY_STARTUP_WORKSPACE_LOADER_ASYNC);
         MAIN_EXECUTOR.getHandler().postAtFrontOfQueue(() -> {
             mStartupLatencyLogger
-                    .logCardinality(workspaceItemCount)
-                    .logEnd(isBindSync
-                            ? LAUNCHER_LATENCY_STARTUP_WORKSPACE_LOADER_SYNC
-                            : LAUNCHER_LATENCY_STARTUP_WORKSPACE_LOADER_ASYNC)
                     .logEnd(LAUNCHER_LATENCY_STARTUP_TOTAL_DURATION)
                     .log()
                     .reset();