| commit | 6cb6ba5036db106f4b8e6e16855c8b980e00ea19 | [log] [tgz] |
|---|---|---|
| author | Jorim Jaggi <jjaggi@google.com> | Mon May 06 14:14:22 2019 +0200 |
| committer | Jorim Jaggi <jjaggi@google.com> | Mon May 06 14:14:22 2019 +0200 |
| tree | a01e539fbf19935243f1da4350113e60f94a733a | |
| parent | 24e9f93b71018f1c939822c82e9d662d5d882bb1 [diff] [blame] |
Do not reset time if time was already set before Test: Open many apps, ensure logs are correct Test: ActivityMetricsLoggerTests Fixes: 131603820 Change-Id: Icbd784db39ba083d1cd52beee88e128dec3ececa
diff --git a/services/core/java/com/android/server/wm/ActivityMetricsLogger.java b/services/core/java/com/android/server/wm/ActivityMetricsLogger.java index 9decb58..feef5e2 100644 --- a/services/core/java/com/android/server/wm/ActivityMetricsLogger.java +++ b/services/core/java/com/android/server/wm/ActivityMetricsLogger.java
@@ -326,7 +326,7 @@ intent)); } - if (!isAnyTransitionActive()) { + if (mCurrentTransitionStartTime == INVALID_START_TIME) { mCurrentTransitionStartTime = SystemClock.uptimeMillis(); mLastTransitionStartTime = mCurrentTransitionStartTime;