From e491f7d5c624390f6267fa14fcfcb93ddf0231f6 Mon Sep 17 00:00:00 2001 From: Dave Miller Date: Fri, 13 May 2016 04:26:46 -0700 Subject: [PATCH] Reverted commit D3292369 Reviewed By: andreicoman11 Differential Revision: D3292369 fbshipit-source-id: 1a41d845ff46c44544f37d85e8154557a979a4ff --- .../react/uimanager/events/TouchEventCoalescingKeyHelper.java | 4 ---- .../src/test/java/com/facebook/react/RootViewTest.java | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/events/TouchEventCoalescingKeyHelper.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/events/TouchEventCoalescingKeyHelper.java index 16fb9ae4a..e5783e3c5 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/events/TouchEventCoalescingKeyHelper.java +++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/events/TouchEventCoalescingKeyHelper.java @@ -81,10 +81,6 @@ public class TouchEventCoalescingKeyHelper { * Stops tracking a new coalescing key corresponding to the gesture with this down time. */ public static void removeCoalescingKey(long downTime) { - int currentValue = sDownTimeToCoalescingKey.get((int) downTime, -1); - if (currentValue == -1) { - throw new RuntimeException("Tried to remove non-existent cookie"); - } sDownTimeToCoalescingKey.delete((int) downTime); } } diff --git a/ReactAndroid/src/test/java/com/facebook/react/RootViewTest.java b/ReactAndroid/src/test/java/com/facebook/react/RootViewTest.java index 679ce6edd..2eb7f5ed8 100644 --- a/ReactAndroid/src/test/java/com/facebook/react/RootViewTest.java +++ b/ReactAndroid/src/test/java/com/facebook/react/RootViewTest.java @@ -162,7 +162,7 @@ public class RootViewTest { ArgumentCaptor.forClass(JavaOnlyArray.class); rootView.onTouchEvent( - MotionEvent.obtain(100, ts, MotionEvent.ACTION_UP, 0, 0, 0)); + MotionEvent.obtain(50, ts, MotionEvent.ACTION_UP, 0, 0, 0)); verify(eventDispatcher).dispatchEvent(upEventCaptor.capture()); verifyNoMoreInteractions(eventDispatcher);