From 1e8b872edcc0e5c09daffef7ecfe2859ce0f41cb Mon Sep 17 00:00:00 2001 From: Craig Mautner Date: Mon, 14 Oct 2013 18:24:52 -0700 Subject: 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 --- services/java/com/android/server/am/ActivityStack.java | 1 + 1 file changed, 1 insertion(+) diff --git a/services/java/com/android/server/am/ActivityStack.java b/services/java/com/android/server/am/ActivityStack.java index 20d443b51f7a..3ee0df39d48e 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); } -- cgit v1.2.3-59-g8ed1b