commit 1c864dcf81ee9885e087a1ecaa5d91f18a2eeed8
author Prabir Pradhan <prabirmsp@google.com> Tue Jul 25 15:44:56 2023 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Jul 25 15:44:56 2023 +0000
tree 5662a05071746a1072969fe3d3c3b9db46bd9bae
parent f7add4d9cf747a5108e1839ee0df4d05c5171f62
parent f44ab48b78109f876671532ca390bfa34a12e78d

Merge "EventHub: Ensure bit arrays are large enough to store all event codes" into main

services/inputflinger/reader/include/EventHub.h

diff --git a/services/inputflinger/reader/include/EventHub.h b/services/inputflinger/reader/include/EventHub.h
index 8347df8..0bcab42 100644
--- a/services/inputflinger/reader/include/EventHub.h
+++ b/services/inputflinger/reader/include/EventHub.h
@@ -626,16 +626,16 @@
 
         ftl::Flags<InputDeviceClass> classes;
 
-        BitArray<KEY_MAX> keyBitmask;
-        BitArray<KEY_MAX> keyState;
-        BitArray<REL_MAX> relBitmask;
-        BitArray<SW_MAX> swBitmask;
-        BitArray<SW_MAX> swState;
-        BitArray<LED_MAX> ledBitmask;
-        BitArray<FF_MAX> ffBitmask;
-        BitArray<INPUT_PROP_MAX> propBitmask;
-        BitArray<MSC_MAX> mscBitmask;
-        BitArray<ABS_MAX> absBitmask;
+        BitArray<KEY_CNT> keyBitmask;
+        BitArray<KEY_CNT> keyState;
+        BitArray<REL_CNT> relBitmask;
+        BitArray<SW_CNT> swBitmask;
+        BitArray<SW_CNT> swState;
+        BitArray<LED_CNT> ledBitmask;
+        BitArray<FF_CNT> ffBitmask;
+        BitArray<INPUT_PROP_CNT> propBitmask;
+        BitArray<MSC_CNT> mscBitmask;
+        BitArray<ABS_CNT> absBitmask;
         struct AxisState {
             RawAbsoluteAxisInfo info;
             int value;