diff options
| author | Craig Mautner <cmautner@google.com> | 2013-10-15 04:03:26 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-10-15 04:03:26 -0700 |
| commit | 6353ea33ad37382e4123d8871fc7cb8db0bd71c0 (patch) | |
| tree | cac23ca4120c0351a36652dd4abab9fd73d3c11a | |
| parent | b45bdac3407a25122e37175ba0b5d8e04dfa0b1d (diff) | |
| parent | 209dc77a6a6bd07f380bb2ee70169fef09ad7fa4 (diff) | |
| download | frameworks_base-6353ea33ad37382e4123d8871fc7cb8db0bd71c0.zip frameworks_base-6353ea33ad37382e4123d8871fc7cb8db0bd71c0.tar.gz frameworks_base-6353ea33ad37382e4123d8871fc7cb8db0bd71c0.tar.bz2 | |
am 209dc77a: am 910deb71: am cf8a6ca9: Merge "Clear displayStartTime whenever starting activity." into klp-dev
* commit '209dc77a6a6bd07f380bb2ee70169fef09ad7fa4':
Clear displayStartTime whenever starting activity.
| -rw-r--r-- | services/java/com/android/server/am/ActivityStack.java | 1 |
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); } |