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

Commit c9d1423e authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Let prepareDrag return error when 0 size drag shadow is specified."

parents fadfd6e1 1821c5a0
Loading
Loading
Loading
Loading
+5 −0
Original line number Diff line number Diff line
@@ -103,6 +103,11 @@ class DragDropController {
                    + " asbinder=" + window.asBinder());
        }

        if (width <= 0 || height <= 0) {
            Slog.w(TAG_WM, "width and height of drag shadow must be positive");
            return null;
        }

        synchronized (mService.mWindowMap) {
            if (dragDropActiveLocked()) {
                Slog.w(TAG_WM, "Drag already in progress");
+88 −0
Original line number Diff line number Diff line
/*
 * Copyright (C) 2017 The Android Open Source Project
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
 *      http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License
 */

package com.android.server.wm;

import static android.view.WindowManager.LayoutParams.TYPE_BASE_APPLICATION;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
import static org.mockito.Matchers.anyInt;
import static org.mockito.Mockito.any;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;

import android.os.IBinder;
import android.platform.test.annotations.Presubmit;
import android.support.test.filters.SmallTest;
import android.support.test.runner.AndroidJUnit4;
import android.view.InputChannel;
import android.view.Surface;
import android.view.SurfaceSession;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
/**
 * Tests for the {@link DragDropController} class.
 *
 * atest com.android.server.wm.DragDropControllerTests
 */
@SmallTest
@RunWith(AndroidJUnit4.class)
@Presubmit
public class DragDropControllerTests extends WindowTestsBase {
    private static final int TIMEOUT_MS = 1000;
    private DragDropController mTarget;
    private WindowState mWindow;
    private IBinder mToken;

    @Before
    public void setUp() throws Exception {
        super.setUp();
        assertNotNull(sWm.mDragDropController);
        mTarget = sWm.mDragDropController;
        mWindow = createWindow(null, TYPE_BASE_APPLICATION, "window");
        synchronized (sWm.mWindowMap) {
            // Because sWm is a static object, the previous operation may remain.
            assertFalse(mTarget.dragDropActiveLocked());
        }
    }

    @After
    public void tearDown() {
        if (mToken != null) {
            mTarget.cancelDragAndDrop(mToken);
        }
    }

    @Test
    public void testPrepareDrag() throws Exception {
        final Surface surface = new Surface();
        mToken = mTarget.prepareDrag(
                new SurfaceSession(), 0, 0, mWindow.mClient, 0, 100, 100, surface);
        assertNotNull(mToken);
    }

    @Test
    public void testPrepareDrag_ZeroSizeSurface() throws Exception {
        final Surface surface = new Surface();
        mToken = mTarget.prepareDrag(
                new SurfaceSession(), 0, 0, mWindow.mClient, 0, 0, 0, surface);
        assertNull(mToken);
    }
}