Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "AML: Rollback calculation of launch time temporally"

Browse Source
This commit is contained in:
TreeHugger Robot
2019-10-22 13:17:19 +00:00
committed by Android (Google) Code Review
parent c53718c865 99f2acdb4d
commit 1061614105
2 changed files with 2 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
services/core/java/com/android/server/wm/ActivityMetricsLogger.java
View File

@@ -187,7 +187,8 @@ class ActivityMetricsLogger {
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 @@ class ActivityMetricsLogger {
return;
}
launchedActivity = r;
if (!r.noDisplay) {
numUndrawnActivities++;
}
}
}

3
services/tests/wmtests/src/com/android/server/wm/ActivityMetricsLaunchObserverTests.java
View File

@@ -208,9 +208,6 @@ public class ActivityMetricsLaunchObserverTests extends ActivityTestsBase {
notifyWindowsDrawn(mTrampolineActivity);
assertWithMessage("Trampoline activity is drawn but the top activity is not yet")
.that(mActivityMetricsLogger.allWindowsDrawn()).isFalse();
notifyWindowsDrawn(mTopActivity);
verifyAsync(mLaunchObserver).onActivityLaunchFinished(eqProto(mTrampolineActivity),