commit 84395e6eb555b2e148e62fe85b222fd9135c1450
author Prabir Pradhan <prabirmsp@google.com> Wed Oct 26 19:52:00 2022 +0000
committer Prabir Pradhan <prabirmsp@google.com> Thu Oct 27 20:55:50 2022 +0000
tree 1a14ac1239e907d8cac91f1756a612b905d98b2b
parent efa77d18072f1ac821e626018f81fc22f66b41c7

Extract HID usage accumulation logic from KeyboardInputMapper

Extract the logic into a HidUsageAccumulator class so that when HID
usage is used in more than one place, the usage code accumulation logic
maintains the same behavior.

There should be no behavior change in this CL.

Bug: 246394583
Test: atest inputflinger_tests
Change-Id: Ia5f9bcac145f07c0d0dca643755dcff1b725d568

services/inputflinger/reader/mapper/KeyboardInputMapper.cpp

diff --git a/services/inputflinger/reader/mapper/KeyboardInputMapper.cpp b/services/inputflinger/reader/mapper/KeyboardInputMapper.cpp
index 33b8a1b..da9413e 100644
--- a/services/inputflinger/reader/mapper/KeyboardInputMapper.cpp
+++ b/services/inputflinger/reader/mapper/KeyboardInputMapper.cpp
@@ -180,7 +180,7 @@
 
 std::list<NotifyArgs> KeyboardInputMapper::reset(nsecs_t when) {
     std::list<NotifyArgs> out = cancelAllDownKeys(when);
-    mCurrentHidUsage = 0;
+    mHidUsageAccumulator.reset();
 
     resetLedState();
 
@@ -190,29 +190,17 @@
 
 std::list<NotifyArgs> KeyboardInputMapper::process(const RawEvent* rawEvent) {
     std::list<NotifyArgs> out;
+    mHidUsageAccumulator.process(*rawEvent);
     switch (rawEvent->type) {
         case EV_KEY: {
             int32_t scanCode = rawEvent->code;
-            int32_t usageCode = mCurrentHidUsage;
-            mCurrentHidUsage = 0;
 
             if (isSupportedScanCode(scanCode)) {
                 out += processKey(rawEvent->when, rawEvent->readTime, rawEvent->value != 0,
-                                  scanCode, usageCode);
+                                  scanCode, mHidUsageAccumulator.consumeCurrentHidUsage());
             }
             break;
         }
-        case EV_MSC: {
-            if (rawEvent->code == MSC_SCAN) {
-                mCurrentHidUsage = rawEvent->value;
-            }
-            break;
-        }
-        case EV_SYN: {
-            if (rawEvent->code == SYN_REPORT) {
-                mCurrentHidUsage = 0;
-            }
-        }
     }
     return out;
 }