commit 99f2acdb4d82e2c3e42f132a5b873254b3723092
author Riddle Hsu <riddlehsu@google.com> Tue Oct 22 18:41:51 2019 +0800
committer Riddle Hsu <riddlehsu@google.com> Tue Oct 22 18:47:16 2019 +0800
tree ae9d46d2ad505487f0f146c729018b3401d9c9de
parent f9527fd0ed65213e38372a141de0f7328a4e8cbb

AML: Rollback calculation of launch time temporally

If a trampoline activity becomes invisible before it reporting
drawn, it should be excluded from the condition of all-drawn.

Bug: 132736359
Test: atest ActivityMetricsLaunchObserverTests
Change-Id: I61b76546e9b3aa977f4d1969d709c64240e7ed5d

services/core/java/com/android/server/wm/ActivityMetricsLogger.java

diff --git a/services/core/java/com/android/server/wm/ActivityMetricsLogger.java b/services/core/java/com/android/server/wm/ActivityMetricsLogger.java
index 6636b16..9d41d97 100644
--- a/services/core/java/com/android/server/wm/ActivityMetricsLogger.java
+++ b/services/core/java/com/android/server/wm/ActivityMetricsLogger.java
@@ -187,7 +187,8 @@
         private int startingWindowDelayMs = INVALID_DELAY;
         private int bindApplicationDelayMs = INVALID_DELAY;
         private int reason = APP_TRANSITION_TIMEOUT;
-        private int numUndrawnActivities;
+        // TODO(b/132736359) The number may need to consider the visibility change.
+        private int numUndrawnActivities = 1;
         private boolean loggedStartingWindowDrawn;
         private boolean launchTraceActive;
 
@@ -201,9 +202,6 @@
                 return;
             }
             launchedActivity = r;
-            if (!r.noDisplay) {
-                numUndrawnActivities++;
-            }
         }
     }