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

Commit cd84cfab authored by Vladislav Kaznacheev's avatar Vladislav Kaznacheev
Browse files

Make DragEvent.getClipDescription() return null for ACTION_DRAG_ENDED 

This is required to bring the DragEvent behavior in line with JavaDoc.


Bug: 30407098
Change-Id: I87b7f3ed3fe56681ca54a44e5cdeaf32966ad495
parent 6a16f908

core/java/android/view/ViewRootImpl.java

+3 −1
Original line number Diff line number Diff line
@@ -5508,6 +5508,9 @@ public final class ViewRootImpl implements ViewParent, 
                mCurrentDragView = null;    // Start the current-recipient tracking

                mDragDescription = event.mClipDescription;

            } else {

                if (what == DragEvent.ACTION_DRAG_ENDED) {

                    mDragDescription = null;

                }

                event.mClipDescription = mDragDescription;

            }
@@ -5555,7 +5558,6 @@ public final class ViewRootImpl implements ViewParent, 


                // Report the drop result when we're done

                if (what == DragEvent.ACTION_DROP) {

                    mDragDescription = null;

                    try {

                        Log.i(mTag, "Reporting drop result: " + result);

                        mWindowSession.reportDropResult(mWindow, result);