Merge "When waiting for activity to finish don't reset" into klp-dev (cdd82540) · Commits · e / os / android_frameworks_base

services/java/com/android/server/am/ActivityStack.java

+7 −1

Original line number	Diff line number	Diff line
		@@ -620,7 +620,13 @@ final class ActivityStack {
		}

		void clearLaunchTime(ActivityRecord r) {
		// 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() {