commit 8274806df3136b56ef1b336fec099dcd6512f4f6
author daqi <daqi@xiaomi.com> Wed May 31 12:42:12 2017 +0000
committer android-build-merger <android-build-merger@google.com> Wed May 31 12:42:12 2017 +0000
tree fe78f784483019d375f6b2790c1cd25b63aba6b4
parent 22c8e226404413e84204d6780f06ab92c0e97cab
parent 6bc2199774d73f10dc87f74fe60b8ca7b59a2977

Merge "Fix TaskRecord wrong dump element firstActiveTime" am: 30895c5e1e
am: 6bc2199774

Change-Id: Idf798414b9d7d4c41d59c4b57c313e1030cba119

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

diff --git a/services/core/java/com/android/server/am/TaskRecord.java b/services/core/java/com/android/server/am/TaskRecord.java
index 4691e1a..abbdd54 100644
--- a/services/core/java/com/android/server/am/TaskRecord.java
+++ b/services/core/java/com/android/server/am/TaskRecord.java
@@ -1777,7 +1777,7 @@
         pw.print(prefix + "hasBeenVisible=" + hasBeenVisible);
                 pw.print(" mResizeMode=" + ActivityInfo.resizeModeToString(mResizeMode));
                 pw.print(" isResizeable=" + isResizeable());
-                pw.print(" firstActiveTime=" + lastActiveTime);
+                pw.print(" firstActiveTime=" + firstActiveTime);
                 pw.print(" lastActiveTime=" + lastActiveTime);
                 pw.println(" (inactive for " + (getInactiveDuration() / 1000) + "s)");
     }