diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/ui/Input.h | 4 | ||||
| -rw-r--r-- | include/ui/InputDispatcher.h | 7 |
2 files changed, 2 insertions, 9 deletions
diff --git a/include/ui/Input.h b/include/ui/Input.h index 11b798f..4dc8f2a 100644 --- a/include/ui/Input.h +++ b/include/ui/Input.h @@ -507,10 +507,8 @@ enum InputDeviceConfigurationFileType { /* * Get the path of an input device configuration file, if one is available. * Spaces in the name are replaced with underscores. + * Considers both system provided and user installed configuration files. * - * Looks in: <system-root>/usr/<type-specific-directory>/<name><extension>. - * - * TODO Also look in a user installable location. * Returns an empty string if not found. */ extern String8 getInputDeviceConfigurationFilePath( diff --git a/include/ui/InputDispatcher.h b/include/ui/InputDispatcher.h index d0812de..b621680 100644 --- a/include/ui/InputDispatcher.h +++ b/include/ui/InputDispatcher.h @@ -291,9 +291,7 @@ public: * This method is expected to set the POLICY_FLAG_PASS_TO_USER policy flag if the event * should be dispatched to applications. */ - virtual void interceptKeyBeforeQueueing(nsecs_t when, int32_t deviceId, - int32_t action, int32_t& flags, int32_t keyCode, int32_t scanCode, - uint32_t& policyFlags) = 0; + virtual void interceptKeyBeforeQueueing(const KeyEvent* keyEvent, uint32_t& policyFlags) = 0; /* Intercepts a generic touch, trackball or other event before queueing it. * The policy can use this method as an opportunity to perform power management functions @@ -894,9 +892,6 @@ private: // Input channels that will receive a copy of all input events. Vector<sp<InputChannel> > mMonitoringChannels; - // Preallocated key event object used for policy inquiries. - KeyEvent mReusableKeyEvent; - // Event injection and synchronization. Condition mInjectionResultAvailableCondition; bool hasInjectionPermission(int32_t injectorPid, int32_t injectorUid); |