Merge "Add override keyword to in inherited classes" (f6d07ae9) · Commits · e / os / platform_frameworks_native

services/inputflinger/reader/include/EventHub.h

+37 −34

Original line number	Diff line number	Diff line
		@@ -260,61 +260,64 @@ class EventHub : public EventHubInterface {
		public:
		EventHub();

		virtual uint32_t getDeviceClasses(int32_t deviceId) const;
		virtual uint32_t getDeviceClasses(int32_t deviceId) const override;

		virtual InputDeviceIdentifier getDeviceIdentifier(int32_t deviceId) const;
		virtual InputDeviceIdentifier getDeviceIdentifier(int32_t deviceId) const override;

		virtual int32_t getDeviceControllerNumber(int32_t deviceId) const;
		virtual int32_t getDeviceControllerNumber(int32_t deviceId) const override;

		virtual void getConfiguration(int32_t deviceId, PropertyMap* outConfiguration) const;
		virtual void getConfiguration(int32_t deviceId, PropertyMap* outConfiguration) const override;

		virtual status_t getAbsoluteAxisInfo(int32_t deviceId, int axis,
		RawAbsoluteAxisInfo* outAxisInfo) const;
		RawAbsoluteAxisInfo* outAxisInfo) const override;

		virtual bool hasRelativeAxis(int32_t deviceId, int axis) const;
		virtual bool hasRelativeAxis(int32_t deviceId, int axis) const override;

		virtual bool hasInputProperty(int32_t deviceId, int property) const;
		virtual bool hasInputProperty(int32_t deviceId, int property) const override;

		virtual status_t mapKey(int32_t deviceId, int32_t scanCode, int32_t usageCode,
		int32_t metaState, int32_t* outKeycode, int32_t* outMetaState,
		uint32_t* outFlags) const;
		uint32_t* outFlags) const override;

		virtual status_t mapAxis(int32_t deviceId, int32_t scanCode, AxisInfo* outAxisInfo) const;
		virtual status_t mapAxis(int32_t deviceId, int32_t scanCode,
		AxisInfo* outAxisInfo) const override;

		virtual void setExcludedDevices(const std::vector<std::string>& devices);
		virtual void setExcludedDevices(const std::vector<std::string>& devices) override;

		virtual int32_t getScanCodeState(int32_t deviceId, int32_t scanCode) const;
		virtual int32_t getKeyCodeState(int32_t deviceId, int32_t keyCode) const;
		virtual int32_t getSwitchState(int32_t deviceId, int32_t sw) const;
		virtual status_t getAbsoluteAxisValue(int32_t deviceId, int32_t axis, int32_t* outValue) const;
		virtual int32_t getScanCodeState(int32_t deviceId, int32_t scanCode) const override;
		virtual int32_t getKeyCodeState(int32_t deviceId, int32_t keyCode) const override;
		virtual int32_t getSwitchState(int32_t deviceId, int32_t sw) const override;
		virtual status_t getAbsoluteAxisValue(int32_t deviceId, int32_t axis,
		int32_t* outValue) const override;

		virtual bool markSupportedKeyCodes(int32_t deviceId, size_t numCodes, const int32_t* keyCodes,
		uint8_t* outFlags) const;
		uint8_t* outFlags) const override;

		virtual size_t getEvents(int timeoutMillis, RawEvent* buffer, size_t bufferSize);
		virtual std::vector<TouchVideoFrame> getVideoFrames(int32_t deviceId);
		virtual size_t getEvents(int timeoutMillis, RawEvent* buffer, size_t bufferSize) override;
		virtual std::vector<TouchVideoFrame> getVideoFrames(int32_t deviceId) override;

		virtual bool hasScanCode(int32_t deviceId, int32_t scanCode) const;
		virtual bool hasLed(int32_t deviceId, int32_t led) const;
		virtual void setLedState(int32_t deviceId, int32_t led, bool on);
		virtual bool hasScanCode(int32_t deviceId, int32_t scanCode) const override;
		virtual bool hasLed(int32_t deviceId, int32_t led) const override;
		virtual void setLedState(int32_t deviceId, int32_t led, bool on) override;

		virtual void getVirtualKeyDefinitions(int32_t deviceId,
		std::vector<VirtualKeyDefinition>& outVirtualKeys) const;
		virtual void getVirtualKeyDefinitions(
		int32_t deviceId, std::vector<VirtualKeyDefinition>& outVirtualKeys) const override;

		virtual sp<KeyCharacterMap> getKeyCharacterMap(int32_t deviceId) const;
		virtual bool setKeyboardLayoutOverlay(int32_t deviceId, const sp<KeyCharacterMap>& map);
		virtual sp<KeyCharacterMap> getKeyCharacterMap(int32_t deviceId) const override;
		virtual bool setKeyboardLayoutOverlay(int32_t deviceId,
		const sp<KeyCharacterMap>& map) override;

		virtual void vibrate(int32_t deviceId, nsecs_t duration);
		virtual void cancelVibrate(int32_t deviceId);
		virtual void vibrate(int32_t deviceId, nsecs_t duration) override;
		virtual void cancelVibrate(int32_t deviceId) override;

		virtual void requestReopenDevices();
		virtual void requestReopenDevices() override;

		virtual void wake();
		virtual void wake() override;

		virtual void dump(std::string& dump);
		virtual void monitor();
		virtual void dump(std::string& dump) override;
		virtual void monitor() override;

		virtual ~EventHub();
		virtual ~EventHub() override;

		private:
		struct Device {
		@@ -383,9 +386,9 @@ private:

		void configureFd(Device* device);

		bool isDeviceEnabled(int32_t deviceId);
		status_t enableDevice(int32_t deviceId);
		status_t disableDevice(int32_t deviceId);
		bool isDeviceEnabled(int32_t deviceId) override;
		status_t enableDevice(int32_t deviceId) override;
		status_t disableDevice(int32_t deviceId) override;
		status_t registerFdForEpoll(int fd);
		status_t unregisterFdFromEpoll(int fd);
		status_t registerDeviceForEpollLocked(Device* device);

services/inputflinger/reader/include/InputReader.h

+29 −27

Original line number	Diff line number	Diff line
		@@ -52,31 +52,33 @@ public:
		const sp<InputListenerInterface>& listener);
		virtual ~InputReader();

		virtual void dump(std::string& dump);
		virtual void monitor();
		virtual void dump(std::string& dump) override;
		virtual void monitor() override;

		virtual void loopOnce();
		virtual void loopOnce() override;

		virtual void getInputDevices(std::vector<InputDeviceInfo>& outInputDevices);
		virtual void getInputDevices(std::vector<InputDeviceInfo>& outInputDevices) override;

		virtual bool isInputDeviceEnabled(int32_t deviceId);
		virtual bool isInputDeviceEnabled(int32_t deviceId) override;

		virtual int32_t getScanCodeState(int32_t deviceId, uint32_t sourceMask, int32_t scanCode);
		virtual int32_t getKeyCodeState(int32_t deviceId, uint32_t sourceMask, int32_t keyCode);
		virtual int32_t getSwitchState(int32_t deviceId, uint32_t sourceMask, int32_t sw);
		virtual int32_t getScanCodeState(int32_t deviceId, uint32_t sourceMask,
		int32_t scanCode) override;
		virtual int32_t getKeyCodeState(int32_t deviceId, uint32_t sourceMask,
		int32_t keyCode) override;
		virtual int32_t getSwitchState(int32_t deviceId, uint32_t sourceMask, int32_t sw) override;

		virtual void toggleCapsLockState(int32_t deviceId);
		virtual void toggleCapsLockState(int32_t deviceId) override;

		virtual bool hasKeys(int32_t deviceId, uint32_t sourceMask, size_t numCodes,
		const int32_t* keyCodes, uint8_t* outFlags);
		const int32_t* keyCodes, uint8_t* outFlags) override;

		virtual void requestRefreshConfiguration(uint32_t changes);
		virtual void requestRefreshConfiguration(uint32_t changes) override;

		virtual void vibrate(int32_t deviceId, const nsecs_t* pattern, size_t patternSize,
		ssize_t repeat, int32_t token);
		virtual void cancelVibrate(int32_t deviceId, int32_t token);
		ssize_t repeat, int32_t token) override;
		virtual void cancelVibrate(int32_t deviceId, int32_t token) override;

		virtual bool canDispatchToDisplay(int32_t deviceId, int32_t displayId);
		virtual bool canDispatchToDisplay(int32_t deviceId, int32_t displayId) override;

		protected:
		// These members are protected so they can be instrumented by test cases.
		@@ -90,20 +92,20 @@ protected:
		public:
		explicit ContextImpl(InputReader* reader);

		virtual void updateGlobalMetaState();
		virtual int32_t getGlobalMetaState();
		virtual void disableVirtualKeysUntil(nsecs_t time);
		virtual void updateGlobalMetaState() override;
		virtual int32_t getGlobalMetaState() override;
		virtual void disableVirtualKeysUntil(nsecs_t time) override;
		virtual bool shouldDropVirtualKey(nsecs_t now, InputDevice* device, int32_t keyCode,
		int32_t scanCode);
		virtual void fadePointer();
		virtual void requestTimeoutAtTime(nsecs_t when);
		virtual int32_t bumpGeneration();
		virtual void getExternalStylusDevices(std::vector<InputDeviceInfo>& outDevices);
		virtual void dispatchExternalStylusState(const StylusState& outState);
		virtual InputReaderPolicyInterface* getPolicy();
		virtual InputListenerInterface* getListener();
		virtual EventHubInterface* getEventHub();
		virtual uint32_t getNextSequenceNum();
		int32_t scanCode) override;
		virtual void fadePointer() override;
		virtual void requestTimeoutAtTime(nsecs_t when) override;
		virtual int32_t bumpGeneration() override;
		virtual void getExternalStylusDevices(std::vector<InputDeviceInfo>& outDevices) override;
		virtual void dispatchExternalStylusState(const StylusState& outState) override;
		virtual InputReaderPolicyInterface* getPolicy() override;
		virtual InputListenerInterface* getListener() override;
		virtual EventHubInterface* getEventHub() override;
		virtual uint32_t getNextSequenceNum() override;
		} mContext;

		friend class ContextImpl;

services/inputflinger/reader/mapper/CursorInputMapper.h

+10 −9

Original line number	Diff line number	Diff line
		@@ -56,18 +56,19 @@ public:
		explicit CursorInputMapper(InputDevice* device);
		virtual ~CursorInputMapper();

		virtual uint32_t getSources();
		virtual void populateDeviceInfo(InputDeviceInfo* deviceInfo);
		virtual void dump(std::string& dump);
		virtual void configure(nsecs_t when, const InputReaderConfiguration* config, uint32_t changes);
		virtual void reset(nsecs_t when);
		virtual void process(const RawEvent* rawEvent);
		virtual uint32_t getSources() override;
		virtual void populateDeviceInfo(InputDeviceInfo* deviceInfo) override;
		virtual void dump(std::string& dump) override;
		virtual void configure(nsecs_t when, const InputReaderConfiguration* config,
		uint32_t changes) override;
		virtual void reset(nsecs_t when) override;
		virtual void process(const RawEvent* rawEvent) override;

		virtual int32_t getScanCodeState(uint32_t sourceMask, int32_t scanCode);
		virtual int32_t getScanCodeState(uint32_t sourceMask, int32_t scanCode) override;

		virtual void fadePointer();
		virtual void fadePointer() override;

		virtual std::optional<int32_t> getAssociatedDisplayId();
		virtual std::optional<int32_t> getAssociatedDisplayId() override;

		private:
		// Amount that trackball needs to move in order to generate a key event.

services/inputflinger/reader/mapper/ExternalStylusInputMapper.h

+9 −7

Original line number	Diff line number	Diff line
		@@ -30,13 +30,13 @@ public:
		explicit ExternalStylusInputMapper(InputDevice* device);
		virtual ~ExternalStylusInputMapper() = default;

		virtual uint32_t getSources();
		virtual void populateDeviceInfo(InputDeviceInfo* deviceInfo);
		virtual void dump(std::string& dump);
		virtual void configure(nsecs_t when, const InputReaderConfiguration* config, uint32_t changes);
		virtual void reset(nsecs_t when);
		virtual void process(const RawEvent* rawEvent);
		virtual void sync(nsecs_t when);
		virtual uint32_t getSources() override;
		virtual void populateDeviceInfo(InputDeviceInfo* deviceInfo) override;
		virtual void dump(std::string& dump) override;
		virtual void configure(nsecs_t when, const InputReaderConfiguration* config,
		uint32_t changes) override;
		virtual void reset(nsecs_t when) override;
		virtual void process(const RawEvent* rawEvent) override;

		private:
		SingleTouchMotionAccumulator mSingleTouchMotionAccumulator;
		@@ -44,6 +44,8 @@ private:
		TouchButtonAccumulator mTouchButtonAccumulator;

		StylusState mStylusState;

		void sync(nsecs_t when);
		};

		} // namespace android

services/inputflinger/reader/mapper/JoystickInputMapper.h

+7 −6

Original line number	Diff line number	Diff line
		@@ -26,12 +26,13 @@ public:
		explicit JoystickInputMapper(InputDevice* device);
		virtual ~JoystickInputMapper();

		virtual uint32_t getSources();
		virtual void populateDeviceInfo(InputDeviceInfo* deviceInfo);
		virtual void dump(std::string& dump);
		virtual void configure(nsecs_t when, const InputReaderConfiguration* config, uint32_t changes);
		virtual void reset(nsecs_t when);
		virtual void process(const RawEvent* rawEvent);
		virtual uint32_t getSources() override;
		virtual void populateDeviceInfo(InputDeviceInfo* deviceInfo) override;
		virtual void dump(std::string& dump) override;
		virtual void configure(nsecs_t when, const InputReaderConfiguration* config,
		uint32_t changes) override;
		virtual void reset(nsecs_t when) override;
		virtual void process(const RawEvent* rawEvent) override;

		private:
		struct Axis {