Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5e16325c authored by Sunny Goyal's avatar Sunny Goyal Committed by Android (Google) Code Review
Browse files

Merge "Fixing crash when unfolding with an app already open" into tm-dev

parents d1567eff 6d5a1c13

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

+4 −5
Original line number Diff line number Diff line
@@ -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;
@@ -688,11 +689,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