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

Commit 9bdc9aa9 authored by Joanne Chung's avatar Joanne Chung Committed by Automerger Merge Worker
Browse files

Merge "Fix NPE when calling dispatchTouchEvent in FloatingToolbarRoot" into tm-dev am: 6bc26a03 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16977563

Change-Id: Ib487dd2e7c19781cbd44b4859b03eb3f4737a141
parents 31170414 6bc26a03

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