Add override keyword to in inherited classes
We add the override keyword to methods of a subclass that are meant to
override those in the base class to make sure the method signatures
match at compile time.
Bug: 130819454
Test: m -j
Change-Id: Ib325da3f9a60bfb77838fd37e44daf8f7c98e7ab
diff --git a/services/inputflinger/reader/mapper/CursorInputMapper.h b/services/inputflinger/reader/mapper/CursorInputMapper.h
index 52e42a7..77d122a 100644
--- a/services/inputflinger/reader/mapper/CursorInputMapper.h
+++ b/services/inputflinger/reader/mapper/CursorInputMapper.h
@@ -56,18 +56,19 @@
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.
diff --git a/services/inputflinger/reader/mapper/ExternalStylusInputMapper.h b/services/inputflinger/reader/mapper/ExternalStylusInputMapper.h
index 9764fbb..34f339a 100644
--- a/services/inputflinger/reader/mapper/ExternalStylusInputMapper.h
+++ b/services/inputflinger/reader/mapper/ExternalStylusInputMapper.h
@@ -30,13 +30,13 @@
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 @@
TouchButtonAccumulator mTouchButtonAccumulator;
StylusState mStylusState;
+
+ void sync(nsecs_t when);
};
} // namespace android
diff --git a/services/inputflinger/reader/mapper/JoystickInputMapper.h b/services/inputflinger/reader/mapper/JoystickInputMapper.h
index 1b071d0..b46d27d 100644
--- a/services/inputflinger/reader/mapper/JoystickInputMapper.h
+++ b/services/inputflinger/reader/mapper/JoystickInputMapper.h
@@ -26,12 +26,13 @@
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 {
diff --git a/services/inputflinger/reader/mapper/KeyboardInputMapper.h b/services/inputflinger/reader/mapper/KeyboardInputMapper.h
index 2665c02..de2a377 100644
--- a/services/inputflinger/reader/mapper/KeyboardInputMapper.h
+++ b/services/inputflinger/reader/mapper/KeyboardInputMapper.h
@@ -26,21 +26,22 @@
KeyboardInputMapper(InputDevice* device, uint32_t source, int32_t keyboardType);
virtual ~KeyboardInputMapper();
- 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 getKeyCodeState(uint32_t sourceMask, int32_t keyCode);
- virtual int32_t getScanCodeState(uint32_t sourceMask, int32_t scanCode);
+ virtual int32_t getKeyCodeState(uint32_t sourceMask, int32_t keyCode) override;
+ virtual int32_t getScanCodeState(uint32_t sourceMask, int32_t scanCode) override;
virtual bool markSupportedKeyCodes(uint32_t sourceMask, size_t numCodes,
- const int32_t* keyCodes, uint8_t* outFlags);
+ const int32_t* keyCodes, uint8_t* outFlags) override;
- virtual int32_t getMetaState();
- virtual void updateMetaState(int32_t keyCode);
- virtual std::optional<int32_t> getAssociatedDisplayId();
+ virtual int32_t getMetaState() override;
+ virtual void updateMetaState(int32_t keyCode) override;
+ virtual std::optional<int32_t> getAssociatedDisplayId() override;
private:
// The current viewport.
diff --git a/services/inputflinger/reader/mapper/MultiTouchInputMapper.h b/services/inputflinger/reader/mapper/MultiTouchInputMapper.h
index 87841eb..a45c3cb 100644
--- a/services/inputflinger/reader/mapper/MultiTouchInputMapper.h
+++ b/services/inputflinger/reader/mapper/MultiTouchInputMapper.h
@@ -94,8 +94,8 @@
explicit MultiTouchInputMapper(InputDevice* device);
virtual ~MultiTouchInputMapper();
- virtual void reset(nsecs_t when);
- virtual void process(const RawEvent* rawEvent);
+ virtual void reset(nsecs_t when) override;
+ virtual void process(const RawEvent* rawEvent) override;
protected:
virtual void syncTouch(nsecs_t when, RawState* outState);
diff --git a/services/inputflinger/reader/mapper/RotaryEncoderInputMapper.h b/services/inputflinger/reader/mapper/RotaryEncoderInputMapper.h
index 2648837..38c7258 100644
--- a/services/inputflinger/reader/mapper/RotaryEncoderInputMapper.h
+++ b/services/inputflinger/reader/mapper/RotaryEncoderInputMapper.h
@@ -27,12 +27,13 @@
explicit RotaryEncoderInputMapper(InputDevice* device);
virtual ~RotaryEncoderInputMapper();
- 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:
CursorScrollAccumulator mRotaryEncoderScrollAccumulator;
diff --git a/services/inputflinger/reader/mapper/SingleTouchInputMapper.h b/services/inputflinger/reader/mapper/SingleTouchInputMapper.h
index d6b1455..8438eee 100644
--- a/services/inputflinger/reader/mapper/SingleTouchInputMapper.h
+++ b/services/inputflinger/reader/mapper/SingleTouchInputMapper.h
@@ -27,8 +27,8 @@
explicit SingleTouchInputMapper(InputDevice* device);
virtual ~SingleTouchInputMapper();
- virtual void reset(nsecs_t when);
- virtual void process(const RawEvent* rawEvent);
+ virtual void reset(nsecs_t when) override;
+ virtual void process(const RawEvent* rawEvent) override;
protected:
virtual void syncTouch(nsecs_t when, RawState* outState);
diff --git a/services/inputflinger/reader/mapper/SwitchInputMapper.h b/services/inputflinger/reader/mapper/SwitchInputMapper.h
index dd4bb9e..e65d4e2 100644
--- a/services/inputflinger/reader/mapper/SwitchInputMapper.h
+++ b/services/inputflinger/reader/mapper/SwitchInputMapper.h
@@ -26,11 +26,11 @@
explicit SwitchInputMapper(InputDevice* device);
virtual ~SwitchInputMapper();
- virtual uint32_t getSources();
- virtual void process(const RawEvent* rawEvent);
+ virtual uint32_t getSources() override;
+ virtual void process(const RawEvent* rawEvent) override;
- virtual int32_t getSwitchState(uint32_t sourceMask, int32_t switchCode);
- virtual void dump(std::string& dump);
+ virtual int32_t getSwitchState(uint32_t sourceMask, int32_t switchCode) override;
+ virtual void dump(std::string& dump) override;
private:
uint32_t mSwitchValues;
diff --git a/services/inputflinger/reader/mapper/TouchInputMapper.h b/services/inputflinger/reader/mapper/TouchInputMapper.h
index cf6cd76..89c017d 100644
--- a/services/inputflinger/reader/mapper/TouchInputMapper.h
+++ b/services/inputflinger/reader/mapper/TouchInputMapper.h
@@ -135,23 +135,24 @@
explicit TouchInputMapper(InputDevice* device);
virtual ~TouchInputMapper();
- 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 getKeyCodeState(uint32_t sourceMask, int32_t keyCode);
- virtual int32_t getScanCodeState(uint32_t sourceMask, int32_t scanCode);
+ virtual int32_t getKeyCodeState(uint32_t sourceMask, int32_t keyCode) override;
+ virtual int32_t getScanCodeState(uint32_t sourceMask, int32_t scanCode) override;
virtual bool markSupportedKeyCodes(uint32_t sourceMask, size_t numCodes,
- const int32_t* keyCodes, uint8_t* outFlags);
+ const int32_t* keyCodes, uint8_t* outFlags) override;
- virtual void fadePointer();
- virtual void cancelTouch(nsecs_t when);
- virtual void timeoutExpired(nsecs_t when);
- virtual void updateExternalStylusState(const StylusState& state);
- virtual std::optional<int32_t> getAssociatedDisplayId();
+ virtual void fadePointer() override;
+ virtual void cancelTouch(nsecs_t when) override;
+ virtual void timeoutExpired(nsecs_t when) override;
+ virtual void updateExternalStylusState(const StylusState& state) override;
+ virtual std::optional<int32_t> getAssociatedDisplayId() override;
protected:
CursorButtonAccumulator mCursorButtonAccumulator;
diff --git a/services/inputflinger/reader/mapper/VibratorInputMapper.h b/services/inputflinger/reader/mapper/VibratorInputMapper.h
index 6b33f48..dc67890 100644
--- a/services/inputflinger/reader/mapper/VibratorInputMapper.h
+++ b/services/inputflinger/reader/mapper/VibratorInputMapper.h
@@ -26,14 +26,15 @@
explicit VibratorInputMapper(InputDevice* device);
virtual ~VibratorInputMapper();
- virtual uint32_t getSources();
- virtual void populateDeviceInfo(InputDeviceInfo* deviceInfo);
- virtual void process(const RawEvent* rawEvent);
+ virtual uint32_t getSources() override;
+ virtual void populateDeviceInfo(InputDeviceInfo* deviceInfo) override;
+ virtual void process(const RawEvent* rawEvent) override;
- virtual void vibrate(const nsecs_t* pattern, size_t patternSize, ssize_t repeat, int32_t token);
- virtual void cancelVibrate(int32_t token);
- virtual void timeoutExpired(nsecs_t when);
- virtual void dump(std::string& dump);
+ virtual void vibrate(const nsecs_t* pattern, size_t patternSize, ssize_t repeat,
+ int32_t token) override;
+ virtual void cancelVibrate(int32_t token) override;
+ virtual void timeoutExpired(nsecs_t when) override;
+ virtual void dump(std::string& dump) override;
private:
bool mVibrating;