From 6d5a1c1307bc9bac6385835c758eccb5e14756f4 Mon Sep 17 00:00:00 2001 From: Sunny Goyal Date: Tue, 29 Mar 2022 16:28:10 -0700 Subject: [PATCH] Fixing crash when unfolding with an app already open Bug: 227388787 Test: Manual Change-Id: Ib1726b99a978bd613c337c2eff4873322d894485 --- .../com/android/quickstep/TouchInteractionService.java | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/quickstep/src/com/android/quickstep/TouchInteractionService.java b/quickstep/src/com/android/quickstep/TouchInteractionService.java index ff67b096da..ba4bc5d9c7 100644 --- a/quickstep/src/com/android/quickstep/TouchInteractionService.java +++ b/quickstep/src/com/android/quickstep/TouchInteractionService.java @@ -71,6 +71,7 @@ import com.android.launcher3.Utilities; import com.android.launcher3.config.FeatureFlags; import com.android.launcher3.provider.RestoreDbTask; import com.android.launcher3.statemanager.StatefulActivity; +import com.android.launcher3.taskbar.TaskbarActivityContext; import com.android.launcher3.taskbar.TaskbarManager; import com.android.launcher3.testing.TestLogging; import com.android.launcher3.testing.TestProtocol; @@ -687,11 +688,9 @@ public class TouchInteractionService extends Service } // If Taskbar is present, we listen for long press to unstash it. - BaseActivityInterface activityInterface = newGestureState.getActivityInterface(); - StatefulActivity activity = activityInterface.getCreatedActivity(); - if (activity != null && activity.getDeviceProfile().isTaskbarPresent) { - base = new TaskbarStashInputConsumer(this, base, mInputMonitorCompat, - mTaskbarManager.getCurrentActivityContext()); + TaskbarActivityContext tac = mTaskbarManager.getCurrentActivityContext(); + if (tac != null) { + base = new TaskbarStashInputConsumer(this, base, mInputMonitorCompat, tac); } // If Bubbles is expanded, use the overlay input consumer, which will close Bubbles