commit b47a99e3ccdacc77eba8c4b05b2785e1f7f0ab18
author Tony Wickham <twickham@google.com> Mon Jun 22 17:37:07 2020 -0700
committer Winson Chung <winsonc@google.com> Tue Jun 23 16:45:51 2020 +0000
tree ab9aab03a0dd74ab8a5e54bdbbd4ade93c021bba
parent a2710855066f2c0003d219acf60d826a24fe4b21

Store newGestureState before onConsumerAboutToBeSwitched clears it

Bug: 159659393
Change-Id: If98d54b7ca397ef56a5c6d50c0fd92f25a9494b4
(cherry picked from commit efb7e60edcbe7de90bf1ff2515b2016d4603de64)

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

diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/TouchInteractionService.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/TouchInteractionService.java
index bfdddbd..6e0b517 100644
--- a/quickstep/recents_ui_overrides/src/com/android/quickstep/TouchInteractionService.java
+++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/TouchInteractionService.java
@@ -480,8 +480,9 @@
                 // Clone the previous gesture state since onConsumerAboutToBeSwitched might trigger
                 // onConsumerInactive and wipe the previous gesture state
                 GestureState prevGestureState = new GestureState(mGestureState);
-                mGestureState = createGestureState(mGestureState);
+                GestureState newGestureState = createGestureState(mGestureState);
                 mConsumer.onConsumerAboutToBeSwitched();
+                mGestureState = newGestureState;
                 mConsumer = newConsumer(prevGestureState, mGestureState, event);
 
                 ActiveGestureLog.INSTANCE.addLog("setInputConsumer: " + mConsumer.getName());