From 1a41fe079e3347a017134fc74d0fd145420e1847 Mon Sep 17 00:00:00 2001 From: Prabir Pradhan Date: Mon, 11 Mar 2024 18:38:40 +0000 Subject: Increase leniency of precondition check for MotionEvent::split The severity of a specific precondition check was unintentionally promoted from WARNING to FATAL in the following refactor: I6230b6aa0696dcfc275a5a14ab4af3d4b7bd0b45 Here, we demote it back to a non-fatal check. Bug: 328852741 Bug: 329107108 Test: atest inputflinger_tests Change-Id: If2cb22d528d5e68c1e035a3e4291dae7fc32bb34 --- libs/input/Input.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'libs/input/Input.cpp') diff --git a/libs/input/Input.cpp b/libs/input/Input.cpp index ff9d9a94c9..61a964ece9 100644 --- a/libs/input/Input.cpp +++ b/libs/input/Input.cpp @@ -1034,7 +1034,8 @@ std::tuple, std::vector> (splitPointerProperties.size() * (historySize + 1))); if (CC_UNLIKELY(splitPointerProperties.size() != splitCount)) { - LOG(FATAL) << "Cannot split MotionEvent: Requested splitting " << splitCount + // TODO(b/329107108): Promote this to a fatal check once bugs in the caller are resolved. + LOG(ERROR) << "Cannot split MotionEvent: Requested splitting " << splitCount << " pointers from the original event, but the original event only contained " << splitPointerProperties.size() << " of those pointers."; } -- cgit v1.2.3-59-g8ed1b