diff options
| author | Craig Mautner <cmautner@google.com> | 2013-10-14 18:30:16 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-10-14 18:30:16 -0700 |
| commit | 910deb7155352c8d95e6351fc3efd4eac6b463a5 (patch) | |
| tree | 12f3a8033c8534b46356709b00f049ad2fb74452 | |
| parent | 30408434d3c04efa2b4a18838f9dfe0b5760f4ef (diff) | |
| parent | cf8a6ca9aa31b4e8930b0f6e6cbc3108fda4a9bf (diff) | |
| download | frameworks_base-910deb7155352c8d95e6351fc3efd4eac6b463a5.zip frameworks_base-910deb7155352c8d95e6351fc3efd4eac6b463a5.tar.gz frameworks_base-910deb7155352c8d95e6351fc3efd4eac6b463a5.tar.bz2 | |
am cf8a6ca9: Merge "Clear displayStartTime whenever starting activity." into klp-dev
* commit 'cf8a6ca9aa31b4e8930b0f6e6cbc3108fda4a9bf':
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); } |