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

Commit 93a4dc6c authored by Christopher Tate's avatar Christopher Tate Committed by Android (Google) Code Review
Browse files

Merge "Disable cross-app drag/drop"

parents e2db4165 7f9ff9d1

api/current.xml

+1 −12
Original line number Original line Diff line number Diff line
@@ -223867,17 +223867,6 @@ 
 visibility="public"

 visibility="public"

>

>

</method>

</method>

<field name="DRAG_FLAG_GLOBAL"

 type="int"

 transient="false"

 volatile="false"

 value="1"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="DRAWING_CACHE_QUALITY_AUTO"

<field name="DRAWING_CACHE_QUALITY_AUTO"

 type="int"

 type="int"

 transient="false"

 transient="false"
@@ -265620,7 +265609,7 @@ 
 deprecated="not deprecated"

 deprecated="not deprecated"

 visibility="public"

 visibility="public"

>

>

<parameter name="t" type="T">

<parameter name="arg0" type="T">

</parameter>

</parameter>

</method>

</method>

</interface>

</interface>

core/java/android/view/View.java

+2 −0
Original line number Original line Diff line number Diff line
@@ -2241,6 +2241,8 @@ public class View implements Drawable.Callback, KeyEvent.Callback, Accessibility 
     * {@link #startDrag(ClipData, DragShadowBuilder, Object, int)} is called

     * {@link #startDrag(ClipData, DragShadowBuilder, Object, int)} is called

     * with this flag set, all visible applications will be able to participate

     * with this flag set, all visible applications will be able to participate

     * in the drag operation and receive the dragged content.

     * in the drag operation and receive the dragged content.

     *

     * @hide

     */

     */

    public static final int DRAG_FLAG_GLOBAL = 1;

    public static final int DRAG_FLAG_GLOBAL = 1;

services/java/com/android/server/WindowManagerService.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -5889,7 +5889,7 @@ public class WindowManagerService extends IWindowManager.Stub 
                        outSurface.copyFrom(surface);

                        outSurface.copyFrom(surface);

                        final IBinder winBinder = window.asBinder();

                        final IBinder winBinder = window.asBinder();

                        token = new Binder();

                        token = new Binder();

                        mDragState = new DragState(token, surface, flags, winBinder);

                        mDragState = new DragState(token, surface, /*flags*/ 0, winBinder);

                        mDragState.mSurface = surface;

                        mDragState.mSurface = surface;

                        token = mDragState.mToken = new Binder();

                        token = mDragState.mToken = new Binder();