From 5b7bf9147b7cf99116f4ed28dd367444b4876d26 Mon Sep 17 00:00:00 2001
From: Winson Chung <winsonc@google.com>
Date: Mon, 20 Jul 2020 13:57:56 -0700
Subject: [PATCH] Create a new instance of rotation touch helper per device
 state

Change-Id: I4e4288eaf37aab5bf0b8115f5e06e64459c20f00
(cherry picked from commit 00850fb588bf7b33b49d4771883039d5fd70be81)
---
 .../com/android/quickstep/RecentsAnimationDeviceState.java    | 2 +-
 quickstep/src/com/android/quickstep/RotationTouchHelper.java  | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/quickstep/src/com/android/quickstep/RecentsAnimationDeviceState.java b/quickstep/src/com/android/quickstep/RecentsAnimationDeviceState.java
index dd80bd758e..7a6bbb4ab9 100644
--- a/quickstep/src/com/android/quickstep/RecentsAnimationDeviceState.java
+++ b/quickstep/src/com/android/quickstep/RecentsAnimationDeviceState.java
@@ -114,7 +114,7 @@ public class RecentsAnimationDeviceState implements
         mDefaultDisplay = DefaultDisplay.INSTANCE.get(context);
         mDisplayId = mDefaultDisplay.getInfo().id;
         runOnDestroy(() -> mDefaultDisplay.removeChangeListener(this));
-        mRotationTouchHelper = RotationTouchHelper.INSTANCE.get(context);
+        mRotationTouchHelper = new RotationTouchHelper(context);
         runOnDestroy(mRotationTouchHelper::destroy);
 
         // Register for user unlocked if necessary
diff --git a/quickstep/src/com/android/quickstep/RotationTouchHelper.java b/quickstep/src/com/android/quickstep/RotationTouchHelper.java
index d89ca10b69..5f3c02205e 100644
--- a/quickstep/src/com/android/quickstep/RotationTouchHelper.java
+++ b/quickstep/src/com/android/quickstep/RotationTouchHelper.java
@@ -41,8 +41,6 @@ import java.util.ArrayList;
 public class RotationTouchHelper implements
         SysUINavigationMode.NavigationModeChangeListener,
         DefaultDisplay.DisplayInfoChangeListener {
-    public static final MainThreadInitializedObject<RotationTouchHelper> INSTANCE =
-            new MainThreadInitializedObject<>(RotationTouchHelper::new);
 
     private final OrientationTouchTransformer mOrientationTouchTransformer;
     private final DefaultDisplay mDefaultDisplay;
@@ -122,7 +120,7 @@ public class RotationTouchHelper implements
 
     private final Context mContext;
 
-    private RotationTouchHelper(Context context) {
+    public RotationTouchHelper(Context context) {
         mContext = context;
         Resources resources = mContext.getResources();
         mSysUiNavMode = SysUINavigationMode.INSTANCE.get(context);