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

Commit 048691cf authored by Chris Tate's avatar Chris Tate
Browse files

Don't stomp on the drag-focus bookkeeping inadvertently. 

Also don't update the focus tracking redundantly.
Fixes bug 3076468

Change-Id: I021e1bb91134d5226735d9510ad7f9a7b650f93f
parent b8203e97

core/java/android/view/ViewRoot.java

+1 −2
Original line number Diff line number Diff line
@@ -2520,7 +2520,6 @@ public final class ViewRoot extends Handler implements ViewParent, View.AttachIn 
                    } catch (RemoteException e) {

                        Slog.e(TAG, "Unable to note drag target change");

                    }

                    mCurrentDragView = prevDragView;

                }

            }

        }
@@ -2540,13 +2539,13 @@ public final class ViewRoot extends Handler implements ViewParent, View.AttachIn 
                event.mAction = DragEvent.ACTION_DRAG_EXITED;

                mCurrentDragView.dispatchDragEvent(event);

            }

            mCurrentDragView = newDragTarget;

        }

        // If we've dragged over a new view, send it the ENTERED message

        if (newDragTarget != null) {

            event.mAction = DragEvent.ACTION_DRAG_ENTERED;

            newDragTarget.dispatchDragEvent(event);

        }

        mCurrentDragView = newDragTarget;

        event.mAction = action;  // restore the event's original state

    }