Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 10616141 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "AML: Rollback calculation of launch time temporally"

parents c53718c8 99f2acdb

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

+2 −4
Original line number Diff line number Diff line
@@ -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++;

            }

        }

    }

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

+0 −3
Original line number Diff line number Diff line
@@ -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),