From 6f0b47d7e0c6b3bfe48c3164f60a4a610e16842e Mon Sep 17 00:00:00 2001
From: Yan Wang <yawanng@google.com>
Date: Thu, 2 Jan 2020 16:09:30 -0800
Subject: [PATCH] Change the order of app transition finish logging.

The purpose is to delay the event of ReportFullyDrawn after ActivityLaunchedFinished event.

Test: run Settings and check the log.
Change-Id: Ic2e6447733a62a6e4e1feba837a219fc37fadbb4
---
 .../core/java/com/android/server/wm/ActivityMetricsLogger.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/services/core/java/com/android/server/wm/ActivityMetricsLogger.java b/services/core/java/com/android/server/wm/ActivityMetricsLogger.java
index 94c2192b620f1..23b94bdb74c81 100644
--- a/services/core/java/com/android/server/wm/ActivityMetricsLogger.java
+++ b/services/core/java/com/android/server/wm/ActivityMetricsLogger.java
@@ -751,10 +751,10 @@ class ActivityMetricsLogger {
         if (abort) {
             launchObserverNotifyActivityLaunchCancelled(info);
         } else {
-            logAppTransitionFinished(info);
             if (info.isInterestingToLoggerAndObserver()) {
                 launchObserverNotifyActivityLaunchFinished(info, timestampNs);
             }
+            logAppTransitionFinished(info);
         }
         info.mPendingDrawActivities.clear();
         mTransitionInfoList.remove(info);