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

Commit a513ffce authored by Jorim Jaggi's avatar Jorim Jaggi Committed by android-build-merger
Browse files

Merge "Do not reset time if time was already set before" into qt-dev am: 615618f7 

am: bc567582

Change-Id: Ic9539ef6f04c2597d9b297b29686150432a3b7fe
parents 83fdf7e1 bc567582

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

+1 −1
Original line number Diff line number Diff line
@@ -326,7 +326,7 @@ class ActivityMetricsLogger { 
                                      intent));

        }



        if (!isAnyTransitionActive()) {

        if (mCurrentTransitionStartTime == INVALID_START_TIME) {



            mCurrentTransitionStartTime = SystemClock.uptimeMillis();

            mLastTransitionStartTime = mCurrentTransitionStartTime;