commit 952e65b2aa60ddfa9ee3e5640a8f9f32be125874
author Prabir Pradhan <prabirmsp@google.com> Thu Jun 23 17:49:55 2022 +0000
committer Prabir Pradhan <prabirmsp@google.com> Fri Jun 24 22:10:55 2022 +0000
tree 58b86f273d1b94be7587ed3fde5b1d13279c0f00
parent eb84c4213df7ee2bb93f6527377bc5bbf64b2ec7

EventHub: Clean up reading from inotify

Refactor reading from inotify to be slightly more readable.

Bug: None
Test: manual: flash device, connect/disconnect BT input device, observe
logs

Change-Id: If4a15a500798d3646b41fdad90b2571e90c80c77

services/inputflinger/reader/include/EventHub.h

diff --git a/services/inputflinger/reader/include/EventHub.h b/services/inputflinger/reader/include/EventHub.h
index 5453ebb..b2d50fc 100644
--- a/services/inputflinger/reader/include/EventHub.h
+++ b/services/inputflinger/reader/include/EventHub.h
@@ -44,6 +44,8 @@
 #include "TouchVideoDevice.h"
 #include "VibrationElement.h"
 
+struct inotify_event;
+
 namespace android {
 
 /* Number of colors : {red, green, blue} */
@@ -648,7 +650,8 @@
     status_t scanDirLocked(const std::string& dirname) REQUIRES(mLock);
     status_t scanVideoDirLocked(const std::string& dirname) REQUIRES(mLock);
     void scanDevicesLocked() REQUIRES(mLock);
-    status_t readNotifyLocked() REQUIRES(mLock);
+    base::Result<void> readNotifyLocked() REQUIRES(mLock);
+    void handleNotifyEventLocked(const inotify_event&) REQUIRES(mLock);
 
     Device* getDeviceByDescriptorLocked(const std::string& descriptor) const REQUIRES(mLock);
     Device* getDeviceLocked(int32_t deviceId) const REQUIRES(mLock);