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

Commit 6bc26a03 authored by Joanne Chung's avatar Joanne Chung Committed by Android (Google) Code Review
Browse files

Merge "Fix NPE when calling dispatchTouchEvent in FloatingToolbarRoot" into tm-dev

parents 7f7b20e0 04b037e0

core/java/android/service/selectiontoolbar/FloatingToolbarRoot.java

+2 −2
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ public class FloatingToolbarRoot extends LinearLayout { 


    private final IBinder mTargetInputToken;

    private final SelectionToolbarRenderService.TransferTouchListener mTransferTouchListener;

    private Rect mContentRect;

    private final Rect mContentRect = new Rect();



    private int mLastDownX = -1;

    private int mLastDownY = -1;
@@ -57,7 +57,7 @@ public class FloatingToolbarRoot extends LinearLayout { 
     * Sets the Rect that shows the selection toolbar content.

     */

    public void setContentRect(Rect contentRect) {

        mContentRect = contentRect;

        mContentRect.set(contentRect);

    }



    @Override