Store newGestureState before onConsumerAboutToBeSwitched clears it

Bug: 159659393
Change-Id: If98d54b7ca397ef56a5c6d50c0fd92f25a9494b4
(cherry picked from commit efb7e60edc)
This commit is contained in:
Tony Wickham
2020-06-22 17:37:07 -07:00
committed by Winson Chung
parent a271085506
commit b47a99e3cc
@@ -480,8 +480,9 @@ public class TouchInteractionService extends Service implements PluginListener<O
// 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());