summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCraig Mautner <cmautner@google.com>2013-10-14 18:24:52 -0700
committerCraig Mautner <cmautner@google.com>2013-10-14 18:24:52 -0700
commit1e8b872edcc0e5c09daffef7ecfe2859ce0f41cb (patch)
tree0cef70f5b5d821faede86c17c74449a0a72ce778
parent19e8273b1a58801778f07e4199d7accb0e5f0198 (diff)
downloadframeworks_base-1e8b872edcc0e5c09daffef7ecfe2859ce0f41cb.zip
frameworks_base-1e8b872edcc0e5c09daffef7ecfe2859ce0f41cb.tar.gz
frameworks_base-1e8b872edcc0e5c09daffef7ecfe2859ce0f41cb.tar.bz2
Clear displayStartTime whenever starting activity.
setLaunchTime() was only being called from resumeTopActivityLaunched() but also needed to be called from minimalResumeActivityLocked(). Fixes bug 11104901. Change-Id: I35c994562dffaf75de014021c775e398224eb3a3
-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 20d443b..3ee0df3 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);
}