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

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

Merge "Making old apps passing null ClipData to startDrag work again."

parents b8a5b9ad 69733178

core/java/android/view/View.java

+3 −1
Original line number Diff line number Diff line
@@ -20661,7 +20661,9 @@ public class View implements Drawable.Callback, KeyEvent.Callback, 
            return false;

        }













        if (data != null) {















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













        }





























        boolean okay = false;







































core/java/android/view/ViewRootImpl.java



+2
−2




























Original line number
Diff line number
Diff line








@@ -5552,8 +5552,8 @@ 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();













                if (what == DragEvent.ACTION_DROP && event.mClipData != null) {













                    event.mClipData.prepareToEnterProcess();















                }































                // Now dispatch the drag/drop event