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

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

Merge "Enable StrictMode.detectFileUriExposure() for drag and drop"

parents 1298aa07 854d3f2e

core/java/android/view/View.java

+3 −0
Original line number Diff line number Diff line
@@ -20674,6 +20674,9 @@ public class View implements Drawable.Callback, KeyEvent.Callback, 
            Log.w(VIEW_LOG_TAG, "startDragAndDrop called on a detached view.");

            return false;

        }













        data.prepareToLeaveProcess((flags & View.DRAG_FLAG_GLOBAL) != 0);



























        boolean okay = false;





























        Point shadowSize = new Point();

























core/java/android/view/ViewRootImpl.java



+4
−0




























Original line number
Diff line number
Diff line








@@ -5539,6 +5539,10 @@ public final class ViewRootImpl implements ViewParent,













                // Remember who the current drag target is pre-dispatch















                final View prevDragView = mCurrentDragView;





























                if (what == DragEvent.ACTION_DROP) {













                    event.getClipData().prepareToEnterProcess();













                }





























                // Now dispatch the drag/drop event















                boolean result = mView.dispatchDragEvent(event);