Merge "When waiting for activity to finish don't reset" into klp-dev

2013-09-10 22:11:57 +00:00
parent 874ae2adf8 5c494547af
commit cdd82540f2
1 changed files with 7 additions and 1 deletions
--- a/services/java/com/android/server/am/ActivityStack.java
+++ b/services/java/com/android/server/am/ActivityStack.java
@@ -620,7 +620,13 @@ final class ActivityStack {
    }

    void clearLaunchTime(ActivityRecord r) {
-        r.displayStartTime = r.fullyDrawnStartTime = 0;
+        // Make sure that there is no activity waiting for this to launch.
+        if (mStackSupervisor.mWaitingActivityLaunched.isEmpty()) {
+            r.displayStartTime = r.fullyDrawnStartTime = 0;
+        } else {
+            mStackSupervisor.removeTimeoutsForActivityLocked(r);
+            mStackSupervisor.scheduleIdleTimeoutLocked(r);
+        }
    }

    void awakeFromSleepingLocked() {