Merge "Don't crash if NSSL gets incomplete gesture" into rvc-dev (afc37b88) · Commits · e / os / android_frameworks_base

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

+9 −2

Original line number	Diff line number	Diff line
		@@ -3866,9 +3866,16 @@ public class NotificationStackScrollLayout extends ViewGroup implements ScrollAd
		initVelocityTrackerIfNotExists();
		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: {
		if (getChildCount() == 0 \|\| !isInContentBounds(ev)) {
		return false;