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

Merge "Don't crash if NSSL gets incomplete gesture" into qt-qpr1-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2020-04-04 02:23:18 +00:00
committed by Android (Google) Code Review
parent 9935249673 c0e4c56696
commit 025baaca78
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayout.java
View File

@@ -3773,9 +3773,16 @@ public class NotificationStackScrollLayout extends ViewGroup implements ScrollAd
initVelocityTrackerIfNotExists(); initVelocityTrackerIfNotExists();
mVelocityTracker.addMovement(ev); mVelocityTracker.addMovement(ev);
final int action = ev.getAction(); final int action = ev.getActionMasked();
if (ev.findPointerIndex(mActivePointerId) == -1 && action != MotionEvent.ACTION_DOWN) {
// Incomplete gesture, possibly due to window swap mid-gesture. Ignore until a new
// one starts.
Log.e(TAG, "Invalid pointerId=" + mActivePointerId + " in onTouchEvent "
+ MotionEvent.actionToString(ev.getActionMasked()));
return true;
}
switch (action & MotionEvent.ACTION_MASK) { switch (action) {
case MotionEvent.ACTION_DOWN: { case MotionEvent.ACTION_DOWN: {
if (getChildCount() == 0 || !isInContentBounds(ev)) { if (getChildCount() == 0 || !isInContentBounds(ev)) {
return false; return false;