summaryrefslogtreecommitdiff
path: root/libs
diff options
context:
space:
mode:
author Siarhei Vishniakou <svv@google.com> 2022-09-13 20:17:59 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-09-13 20:17:59 +0000
commitead9ee63705f06a17db7239edf4c069822201308 (patch)
tree8f7ddca5c0a1251480638fc31063fcaf4f888b2c /libs
parentcb4c9fd8f3a75c628e8c29063d00b9ffcdd4dbd8 (diff)
parent9877bcfdbcd87b292c0a7c7f45939dbe697b8ad2 (diff)
Merge "Toast: Fix MotionEvent has too many PointerCoords" am: 583954b00a am: a826c8f3b7 am: 9877bcfdbc
Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2200465 Change-Id: I455616acdf84c378139dbed28a2c24704915a69f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs')
-rw-r--r--libs/input/Input.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/libs/input/Input.cpp b/libs/input/Input.cpp
index 13ca9ecd35..4127f7ce10 100644
--- a/libs/input/Input.cpp
+++ b/libs/input/Input.cpp
@@ -929,6 +929,8 @@ std::ostream& operator<<(std::ostream& out, const MotionEvent& event) {
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);