summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCraig Mautner <cmautner@google.com>2013-10-15 01:28:47 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2013-10-15 01:28:48 +0000
commitcf8a6ca9aa31b4e8930b0f6e6cbc3108fda4a9bf (patch)
tree86b34bc1db0713754110afbf1b54a78fa81aeb67
parentf803336028e1a183facec1a526268f2bcf54e16b (diff)
parent1e8b872edcc0e5c09daffef7ecfe2859ce0f41cb (diff)
downloadframeworks_base-cf8a6ca9aa31b4e8930b0f6e6cbc3108fda4a9bf.zip
frameworks_base-cf8a6ca9aa31b4e8930b0f6e6cbc3108fda4a9bf.tar.gz
frameworks_base-cf8a6ca9aa31b4e8930b0f6e6cbc3108fda4a9bf.tar.bz2
Merge "Clear displayStartTime whenever starting activity." into klp-dev
-rw-r--r--services/java/com/android/server/am/ActivityStack.java1
1 files changed, 1 insertions, 0 deletions
diff --git a/services/java/com/android/server/am/ActivityStack.java b/services/java/com/android/server/am/ActivityStack.java
index 596e18a..77f874f 100644
--- a/services/java/com/android/server/am/ActivityStack.java
+++ b/services/java/com/android/server/am/ActivityStack.java
@@ -581,6 +581,7 @@ final class ActivityStack {
mService.addRecentTaskLocked(r.task);
completeResumeLocked(r);
mStackSupervisor.checkReadyForSleepLocked();
+ setLaunchTime(r);
if (DEBUG_SAVED_STATE) Slog.i(TAG, "Launch completed; removing icicle of " + r.icicle);
}