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

Commit 3878e9b9 authored by Alison Cichowlas's avatar Alison Cichowlas Committed by android-build-merger
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
am: 36e4de57

Change-Id: Iba1a8b73c04d5a7ed18aaee44c507c38ec580a7d
parents c5b142de 36e4de57

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() {