From 5de9cfde7363204f9f9a19099c1a628d3bac6642 Mon Sep 17 00:00:00 2001
From: Siarhei Vishniakou <svv@google.com>
Date: Thu, 15 Oct 2020 00:05:29 +0000
Subject: [PATCH] Avoid MotionEvent no finish raise unnecessary ANR

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1459888

Bug: 160561987
Test: atest CtsInputTestCases
Note: the test above is being added in ag/12885227

Change-Id: I9d65c7889650df64f1cf122cfa9f6ba38dc4acbb
(cherry picked from commit 6b297e943b76c6dd9a2bec4124513284d32e30a8)
---
 core/jni/android_view_InputEventReceiver.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/jni/android_view_InputEventReceiver.cpp b/core/jni/android_view_InputEventReceiver.cpp
index cc94d6ff5d673..4220c1d87087f 100644
--- a/core/jni/android_view_InputEventReceiver.cpp
+++ b/core/jni/android_view_InputEventReceiver.cpp
@@ -321,7 +321,7 @@ status_t NativeInputEventReceiver::consumeEvents(JNIEnv* env,
                                     jboolean(focusEvent->getHasFocus()),
                                     jboolean(focusEvent->getInTouchMode()));
                 finishInputEvent(seq, true /* handled */);
-                return OK;
+                continue;
             }
 
             default: