commit 0ee750f32bcd50dd1ab8dd449f5c5e4f75c473d1
author Siarhei Vishniakou <svv@google.com> Tue Sep 13 20:44:58 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Sep 13 20:44:58 2022 +0000
tree 68d994321276f8df3828ab92a086de71b963d249
parent 6195dbca2db7171cf97e966b05b311f32f8fe167
parent ead9ee63705f06a17db7239edf4c069822201308

Merge "Toast: Fix MotionEvent has too many PointerCoords" am: 583954b00a am: a826c8f3b7 am: 9877bcfdbc am: ead9ee6370

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2200465

Change-Id: I9c7cfe72d362dc5c0f92231de70901e5acdb5739
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

libs/input/Input.cpp

diff --git a/libs/input/Input.cpp b/libs/input/Input.cpp
index 155cb04..2b7483d 100644
--- a/libs/input/Input.cpp
+++ b/libs/input/Input.cpp
@@ -949,6 +949,8 @@
         out << ", actionButton=" << std::to_string(event.getActionButton());
     }
     const size_t pointerCount = event.getPointerCount();
+    LOG_ALWAYS_FATAL_IF(pointerCount > MAX_POINTERS, "Too many pointers : pointerCount = %zu",
+                        pointerCount);
     for (size_t i = 0; i < pointerCount; i++) {
         out << ", id[" << i << "]=" << event.getPointerId(i);
         float x = event.getX(i);