Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Craig Mautner
2013-09-10 22:11:57 +00:00
committed by Android (Google) Code Review
parent 874ae2adf8 5c494547af
commit cdd82540f2
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
services/java/com/android/server/am/ActivityStack.java
View File

@@ -620,7 +620,13 @@ final class ActivityStack {
} }
void clearLaunchTime(ActivityRecord r) { 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() { void awakeFromSleepingLocked() {