summaryrefslogtreecommitdiff
path: root/services/inputflinger/reader/mapper/MultiTouchInputMapper.h
diff options
context:
space:
mode:
Diffstat (limited to 'services/inputflinger/reader/mapper/MultiTouchInputMapper.h')
-rw-r--r--services/inputflinger/reader/mapper/MultiTouchInputMapper.h15
1 files changed, 6 insertions, 9 deletions
diff --git a/services/inputflinger/reader/mapper/MultiTouchInputMapper.h b/services/inputflinger/reader/mapper/MultiTouchInputMapper.h
index 225ad49363..89ef41d177 100644
--- a/services/inputflinger/reader/mapper/MultiTouchInputMapper.h
+++ b/services/inputflinger/reader/mapper/MultiTouchInputMapper.h
@@ -87,25 +87,22 @@ private:
bool mHaveStylus;
void clearSlots(int32_t initialSlot);
- void warnIfNotInUse(const RawEvent& event, const Slot& slot);
};
class MultiTouchInputMapper : public TouchInputMapper {
public:
explicit MultiTouchInputMapper(InputDeviceContext& deviceContext);
- ~MultiTouchInputMapper() override;
+ virtual ~MultiTouchInputMapper();
- void reset(nsecs_t when) override;
- void process(const RawEvent* rawEvent) override;
+ virtual void reset(nsecs_t when) override;
+ virtual void process(const RawEvent* rawEvent) override;
protected:
- void syncTouch(nsecs_t when, RawState* outState) override;
- void configureRawPointerAxes() override;
- bool hasStylus() const override;
+ virtual void syncTouch(nsecs_t when, RawState* outState);
+ virtual void configureRawPointerAxes();
+ virtual bool hasStylus() const;
private:
- // If the slot is in use, return the bit id. Return std::nullopt otherwise.
- std::optional<int32_t> getActiveBitId(const MultiTouchMotionAccumulator::Slot& inSlot);
MultiTouchMotionAccumulator mMultiTouchMotionAccumulator;
// Specifies the pointer id bits that are in use, and their associated tracking id.