Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 75260282 authored by Schneider Victor-tulias's avatar Schneider Victor-tulias
Browse files

Reuse log IDs when a GestureState is being reused 

Fixes: 227514916
Test: completed several gestures in rapid succession then checked the logs
Change-Id: Ieecde51fbf0398470f85bf54d71ccd4a765463e8
parent 39d9eb81

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);

        }

quickstep/src/com/android/quickstep/util/ActiveGestureLog.java

+5 −0
Original line number Diff line number Diff line
@@ -215,6 +215,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,