commit 515613db9b9d82472c8fce69b2b104c277f68b99
author Chris Banes <chrisbanes@google.com> Thu Aug 20 14:11:23 2015 +0100
committer Chris Banes <chrisbanes@google.com> Thu Aug 20 14:11:23 2015 +0100
tree c70de207ad1d6700242adbdf8714b6ea2f537898
parent 4a4e0872bdf0548188e81740eb62085215e7f976

Fix crash in CoordinatorLayout DO NOT MERGE

Already fixed downstream in I854d97125c26f1584f13ec554e74247cc8c539d6

BUG: 23367283
Change-Id: I7c4c08d7981c78cf9f9158cd7414abe4fce140b3

design/src/android/support/design/widget/CoordinatorLayout.java

diff --git a/design/src/android/support/design/widget/CoordinatorLayout.java b/design/src/android/support/design/widget/CoordinatorLayout.java
index cd1f2ac..656ce56 100644
--- a/design/src/android/support/design/widget/CoordinatorLayout.java
+++ b/design/src/android/support/design/widget/CoordinatorLayout.java
@@ -347,7 +347,7 @@
                 // Cancel all behaviors beneath the one that intercepted.
                 // If the event is "down" then we don't have anything to cancel yet.
                 if (b != null) {
-                    if (cancelEvent != null) {
+                    if (cancelEvent == null) {
                         final long now = SystemClock.uptimeMillis();
                         cancelEvent = MotionEvent.obtain(now, now,
                                 MotionEvent.ACTION_CANCEL, 0.0f, 0.0f, 0);