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

Commit 1b3ccc22 authored by Winson Chung's avatar Winson Chung
Browse files

Only initialize the drag session after we confirm we can handle the drag 

- In ag/28686955 we moved the initialization of the drag session earlier
  in the flow to optimize the call to update the running task, but we
  should only need to initialize if there is valid drag data.

Flag: EXEMPT bugfix
Fixes: 383034393
Test: atest WMShellUnitTests
Change-Id: I8005cee8b7c0d4e58a173ea5de3b53e343f4523d
parent 0a6de0a0

libs/WindowManager/Shell/src/com/android/wm/shell/draganddrop/DragAndDropController.java

+7 −2
Original line number Diff line number Diff line
@@ -332,7 +332,9 @@ public class DragAndDropController implements RemoteCallable<DragAndDropControll 
            dragSession = new DragSession(ActivityTaskManager.getInstance(),

                    mDisplayController.getDisplayLayout(displayId), event.getClipData(),

                    event.getDragFlags());

            dragSession.initialize();

            // Only update the running task for now to determine if we should defer to desktop to

            // handle the drag

            dragSession.updateRunningTask();

            final ActivityManager.RunningTaskInfo taskInfo = dragSession.runningTaskInfo;

            // Desktop tasks will have their own drag handling.

            final boolean isDesktopDrag = taskInfo != null && taskInfo.isFreeform()
@@ -340,7 +342,8 @@ public class DragAndDropController implements RemoteCallable<DragAndDropControll 
            pd.isHandlingDrag = DragUtils.canHandleDrag(event) && !isDesktopDrag;

            ProtoLog.v(ShellProtoLogGroup.WM_SHELL_DRAG_AND_DROP,

                    "Clip description: handlingDrag=%b itemCount=%d mimeTypes=%s flags=%s",

                    pd.isHandlingDrag, event.getClipData().getItemCount(),

                    pd.isHandlingDrag,

                    event.getClipData() != null ? event.getClipData().getItemCount() : -1,

                    DragUtils.getMimeTypesConcatenated(description),

                    DragUtils.dragFlagsToString(event.getDragFlags()));

        }
@@ -355,6 +358,8 @@ public class DragAndDropController implements RemoteCallable<DragAndDropControll 
                    Slog.w(TAG, "Unexpected drag start during an active drag");

                    return false;

                }

                // Only initialize the session after we've checked that we're handling the drag

                dragSession.initialize(true /* skipUpdateRunningTask */);

                pd.dragSession = dragSession;

                pd.activeDragCount++;

                pd.dragLayout.prepare(pd.dragSession, mLogger.logStart(pd.dragSession));

libs/WindowManager/Shell/src/com/android/wm/shell/draganddrop/DragSession.java

+6 −5
Original line number Diff line number Diff line
@@ -29,7 +29,6 @@ import android.content.ClipData; 
import android.content.ClipDescription;

import android.content.Intent;

import android.content.pm.ActivityInfo;

import android.os.PersistableBundle;



import androidx.annotation.Nullable;
@@ -44,6 +43,7 @@ import java.util.List; 
 */

public class DragSession {

    private final ActivityTaskManager mActivityTaskManager;

    @Nullable

    private final ClipData mInitialDragData;

    private final int mInitialDragFlags;
@@ -66,7 +66,7 @@ public class DragSession { 
    @WindowConfiguration.ActivityType

    int runningTaskActType = ACTIVITY_TYPE_STANDARD;

    boolean dragItemSupportsSplitscreen;

    int hideDragSourceTaskId = -1;

    final int hideDragSourceTaskId;



    DragSession(ActivityTaskManager activityTaskManager,

            DisplayLayout dispLayout, ClipData data, int dragFlags) {
@@ -83,7 +83,6 @@ public class DragSession { 


    /**

     * Returns the clip description associated with the drag.

     * @return

     */

    ClipDescription getClipDescription() {

        return mInitialDragData.getDescription();
@@ -125,8 +124,10 @@ public class DragSession { 
    /**

     * Updates the session data based on the current state of the system at the start of the drag.

     */

    void initialize() {

    void initialize(boolean skipUpdateRunningTask) {

        if (!skipUpdateRunningTask) {

            updateRunningTask();

        }



        activityInfo = mInitialDragData.getItemAt(0).getActivityInfo();

        // TODO: This should technically check & respect config_supportsNonResizableMultiWindow

libs/WindowManager/Shell/src/com/android/wm/shell/draganddrop/DragUtils.java

+1 −1
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ public class DragUtils { 
     * Returns whether we can handle this particular drag.

     */

    public static boolean canHandleDrag(DragEvent event) {

        if (event.getClipData().getItemCount() <= 0) {

        if (event.getClipData() == null || event.getClipData().getItemCount() <= 0) {

            // No clip data, ignore this drag

            return false;

        }

libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/draganddrop/DragAndDropControllerTest.java

+21 −0
Original line number Diff line number Diff line
@@ -150,4 +150,25 @@ public class DragAndDropControllerTest extends ShellTestCase { 
        mController.onDrag(dragLayout, event);

        verify(mDragAndDropListener, never()).onDragStarted();

    }



    @Test

    public void testOnDragStarted_withNoClipData() {

        final View dragLayout = mock(View.class);

        final Display display = mock(Display.class);

        doReturn(display).when(dragLayout).getDisplay();

        doReturn(DEFAULT_DISPLAY).when(display).getDisplayId();



        final ClipData clipData = createAppClipData(MIMETYPE_APPLICATION_SHORTCUT);

        final DragEvent event = mock(DragEvent.class);

        doReturn(ACTION_DRAG_STARTED).when(event).getAction();

        doReturn(null).when(event).getClipData();

        doReturn(clipData.getDescription()).when(event).getClipDescription();



        // Ensure there's a target so that onDrag will execute

        mController.addDisplayDropTarget(0, mContext, mock(WindowManager.class),

                mock(FrameLayout.class), mock(DragLayout.class));



        // Verify the listener is called on a valid drag action.

        mController.onDrag(dragLayout, event);

    }

}

libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/draganddrop/SplitDragPolicyTest.java

+4 −4
Original line number Diff line number Diff line
@@ -220,7 +220,7 @@ public class SplitDragPolicyTest extends ShellTestCase { 
        setRunningTask(mHomeTask);

        DragSession dragSession = new DragSession(mActivityTaskManager,

                mLandscapeDisplayLayout, data, 0 /* dragFlags */);

        dragSession.initialize();

        dragSession.initialize(false /* skipUpdateRunningTask */);

        mPolicy.start(dragSession, mLoggerSessionId);

        ArrayList<Target> targets = assertExactTargetTypes(

                mPolicy.getTargets(mInsets), TYPE_FULLSCREEN);
@@ -235,7 +235,7 @@ public class SplitDragPolicyTest extends ShellTestCase { 
        setRunningTask(mFullscreenAppTask);

        DragSession dragSession = new DragSession(mActivityTaskManager,

                mLandscapeDisplayLayout, data, 0 /* dragFlags */);

        dragSession.initialize();

        dragSession.initialize(false /* skipUpdateRunningTask */);

        mPolicy.start(dragSession, mLoggerSessionId);

        ArrayList<Target> targets = assertExactTargetTypes(

                mPolicy.getTargets(mInsets), TYPE_SPLIT_LEFT, TYPE_SPLIT_RIGHT);
@@ -255,7 +255,7 @@ public class SplitDragPolicyTest extends ShellTestCase { 
        setRunningTask(mFullscreenAppTask);

        DragSession dragSession = new DragSession(mActivityTaskManager,

                mPortraitDisplayLayout, data, 0 /* dragFlags */);

        dragSession.initialize();

        dragSession.initialize(false /* skipUpdateRunningTask */);

        mPolicy.start(dragSession, mLoggerSessionId);

        ArrayList<Target> targets = assertExactTargetTypes(

                mPolicy.getTargets(mInsets), TYPE_SPLIT_TOP, TYPE_SPLIT_BOTTOM);
@@ -276,7 +276,7 @@ public class SplitDragPolicyTest extends ShellTestCase { 
        setRunningTask(mFullscreenAppTask);

        DragSession dragSession = new DragSession(mActivityTaskManager,

                mLandscapeDisplayLayout, mActivityClipData, 0 /* dragFlags */);

        dragSession.initialize();

        dragSession.initialize(false /* skipUpdateRunningTask */);

        mPolicy.start(dragSession, mLoggerSessionId);

        ArrayList<Target> targets = mPolicy.getTargets(mInsets);

        for (Target t : targets) {