Merge "Use uptimeMillis instead of currentTimeMillis for interval calculation." into oc-dev
am: 776f480c49
Change-Id: I76c22e43e91ae3d92aceaf197ce2860cb0a744d0
diff --git a/services/core/java/com/android/server/am/ActivityMetricsLogger.java b/services/core/java/com/android/server/am/ActivityMetricsLogger.java
index 08ff7de..2dd3b74 100644
--- a/services/core/java/com/android/server/am/ActivityMetricsLogger.java
+++ b/services/core/java/com/android/server/am/ActivityMetricsLogger.java
@@ -133,7 +133,7 @@
*/
void notifyActivityLaunching() {
if (!isAnyTransitionActive()) {
- mCurrentTransitionStartTime = System.currentTimeMillis();
+ mCurrentTransitionStartTime = SystemClock.uptimeMillis();
}
}
@@ -299,7 +299,7 @@
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() {