From efb7e60edcbe7de90bf1ff2515b2016d4603de64 Mon Sep 17 00:00:00 2001
From: Tony Wickham <twickham@google.com>
Date: Mon, 22 Jun 2020 17:37:07 -0700
Subject: [PATCH] Store newGestureState before onConsumerAboutToBeSwitched
 clears it

Bug: 159659393
Change-Id: If98d54b7ca397ef56a5c6d50c0fd92f25a9494b4
---
 .../src/com/android/quickstep/TouchInteractionService.java     | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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 7d70155781..aed444d4b6 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 @@ 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());