Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Joanne Chung
2022-02-23 12:06:32 +00:00
committed by Android (Google) Code Review
parent 7f7b20e086 04b037e07d
commit 6bc26a0374
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/java/android/service/selectiontoolbar/FloatingToolbarRoot.java
View File

@@ -40,7 +40,7 @@ public class FloatingToolbarRoot extends LinearLayout {
private final IBinder mTargetInputToken; private final IBinder mTargetInputToken;
private final SelectionToolbarRenderService.TransferTouchListener mTransferTouchListener; private final SelectionToolbarRenderService.TransferTouchListener mTransferTouchListener;
private Rect mContentRect; private final Rect mContentRect = new Rect();
private int mLastDownX = -1; private int mLastDownX = -1;
private int mLastDownY = -1; private int mLastDownY = -1;
@@ -57,7 +57,7 @@ public class FloatingToolbarRoot extends LinearLayout {
* Sets the Rect that shows the selection toolbar content. * Sets the Rect that shows the selection toolbar content.
*/ */
public void setContentRect(Rect contentRect) { public void setContentRect(Rect contentRect) {
mContentRect = contentRect; mContentRect.set(contentRect);
} }
@Override @Override