Merge "Reuse log IDs when a GestureState is being reused" into tm-qpr-dev (ff7e5382) · Commits · e / os / android_packages_apps_Trebuchet

quickstep/src/com/android/quickstep/TouchInteractionService.java

+5 −2

Original line number	Diff line number	Diff line
		@@ -709,16 +709,19 @@ public class TouchInteractionService extends Service
		}

		public GestureState createGestureState(GestureState previousGestureState) {
		GestureState gestureState = new GestureState(mOverviewComponentObserver,
		ActiveGestureLog.INSTANCE.incrementLogId());
		final GestureState gestureState;
		TopTaskTracker.CachedTaskInfo taskInfo;
		if (mTaskAnimationManager.isRecentsAnimationRunning()) {
		gestureState = new GestureState(mOverviewComponentObserver,
		ActiveGestureLog.INSTANCE.getLogId());
		taskInfo = previousGestureState.getRunningTask();
		gestureState.updateRunningTask(taskInfo);
		gestureState.updateLastStartedTaskId(previousGestureState.getLastStartedTaskId());
		gestureState.updatePreviouslyAppearedTaskIds(
		previousGestureState.getPreviouslyAppearedTaskIds());
		} else {
		gestureState = new GestureState(mOverviewComponentObserver,
		ActiveGestureLog.INSTANCE.incrementLogId());
		taskInfo = TopTaskTracker.INSTANCE.get(this).getCachedTopTask(false);
		gestureState.updateRunningTask(taskInfo);
		}

+5 −0

Original line number	Diff line number	Diff line
		@@ -213,6 +213,11 @@ public class ActiveGestureLog {
		return mCurrentLogId++;
		}

		/** Returns the current log ID. This should be used when a log trace is being reused. */
		public int getLogId() {
		return mCurrentLogId;
		}

		private boolean isEntrySame(
		EventEntry entry,
		int type,