Disable cross-app drag/drop

@hides the View constant that designates a drag as cross-app, and also
forcibly ignores that flag on the system_server side even if it's passed
to startDrag() as a literal.

Change-Id: I6f321bdf0389db5bb44131fd0f8d6b92f049be52

3 files changed, 4 insertions, 13 deletions

diff --git a/api/current.xml b/api/current.xml
index 968b8ed6f6a7..4ba4be0749e3 100644
--- a/api/current.xml
+++ b/api/current.xml
@@ -223867,17 +223867,6 @@
  visibility="public"
 >
 </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"
  type="int"
  transient="false"
@@ -265620,7 +265609,7 @@
  deprecated="not deprecated"
  visibility="public"
 >
-<parameter name="t" type="T">
+<parameter name="arg0" type="T">
 </parameter>
 </method>
 </interface>
diff --git a/core/java/android/view/View.java b/core/java/android/view/View.java
index 378eb210a76a..bbd3e09ea0e6 100644
--- a/core/java/android/view/View.java
+++ b/core/java/android/view/View.java
@@ -2234,6 +2234,8 @@ public class View implements Drawable.Callback, KeyEvent.Callback, Accessibility
      * {@link #startDrag(ClipData, DragShadowBuilder, Object, int)} is called
      * with this flag set, all visible applications will be able to participate
      * in the drag operation and receive the dragged content.
+     *
+     * @hide
      */
     public static final int DRAG_FLAG_GLOBAL = 1;
 
diff --git a/services/java/com/android/server/WindowManagerService.java b/services/java/com/android/server/WindowManagerService.java
index b7a276f76570..b662c5501187 100644
--- a/services/java/com/android/server/WindowManagerService.java
+++ b/services/java/com/android/server/WindowManagerService.java
@@ -5889,7 +5889,7 @@ public class WindowManagerService extends IWindowManager.Stub
                         outSurface.copyFrom(surface);
                         final IBinder winBinder = window.asBinder();
                         token = new Binder();
-                        mDragState = new DragState(token, surface, flags, winBinder);
+                        mDragState = new DragState(token, surface, /*flags*/ 0, winBinder);
                         mDragState.mSurface = surface;
                         token = mDragState.mToken = new Binder();