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

Commit 36e4de57 authored by Android Build Merger (Role)'s avatar Android Build Merger (Role) Committed by Android (Google) Code Review
Browse files

Merge "Merge "Use uptimeMillis instead of currentTimeMillis for interval... 

Merge "Merge "Use uptimeMillis instead of currentTimeMillis for interval calculation." into oc-dev am: 776f480c" into oc-dev-plus-aosp
parents 837dd545 2b7a0bdf

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

+2 −2
Original line number Diff line number Diff line
@@ -133,7 +133,7 @@ class ActivityMetricsLogger { 
     */

    void notifyActivityLaunching() {

        if (!isAnyTransitionActive()) {

            mCurrentTransitionStartTime = System.currentTimeMillis();

            mCurrentTransitionStartTime = SystemClock.uptimeMillis();

        }

    }
@@ -299,7 +299,7 @@ class ActivityMetricsLogger { 
    private int calculateCurrentDelay() {



        // Shouldn't take more than 25 days to launch an app, so int is fine here.

        return (int) (System.currentTimeMillis() - mCurrentTransitionStartTime);

        return (int) (SystemClock.uptimeMillis() - mCurrentTransitionStartTime);

    }



    private void logAppTransitionMultiEvents() {