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

Commit bc567582 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

Change-Id: I50edc0010cf224f5a3a7cbec24329836f1f06ba1
parents 4770650b 615618f7

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;