Revert "InputDevice: return std::optional from getAbsoluteAxisInfo"
This reverts commit 67e1ae63301dc02f4d940b5f480b1f495b3b977e.
Reason for revert: b/353921348
Change-Id: I6148dec70b7ca1c9a21d841b791168b5bfc67ca3
diff --git a/services/inputflinger/reader/mapper/TouchInputMapper.h b/services/inputflinger/reader/mapper/TouchInputMapper.h
index beab6e7..30c58a5 100644
--- a/services/inputflinger/reader/mapper/TouchInputMapper.h
+++ b/services/inputflinger/reader/mapper/TouchInputMapper.h
@@ -61,17 +61,17 @@
struct RawPointerAxes {
RawAbsoluteAxisInfo x{};
RawAbsoluteAxisInfo y{};
- std::optional<RawAbsoluteAxisInfo> pressure{};
- std::optional<RawAbsoluteAxisInfo> touchMajor{};
- std::optional<RawAbsoluteAxisInfo> touchMinor{};
- std::optional<RawAbsoluteAxisInfo> toolMajor{};
- std::optional<RawAbsoluteAxisInfo> toolMinor{};
- std::optional<RawAbsoluteAxisInfo> orientation{};
- std::optional<RawAbsoluteAxisInfo> distance{};
- std::optional<RawAbsoluteAxisInfo> tiltX{};
- std::optional<RawAbsoluteAxisInfo> tiltY{};
- std::optional<RawAbsoluteAxisInfo> trackingId{};
- std::optional<RawAbsoluteAxisInfo> slot{};
+ RawAbsoluteAxisInfo pressure{};
+ RawAbsoluteAxisInfo touchMajor{};
+ RawAbsoluteAxisInfo touchMinor{};
+ RawAbsoluteAxisInfo toolMajor{};
+ RawAbsoluteAxisInfo toolMinor{};
+ RawAbsoluteAxisInfo orientation{};
+ RawAbsoluteAxisInfo distance{};
+ RawAbsoluteAxisInfo tiltX{};
+ RawAbsoluteAxisInfo tiltY{};
+ RawAbsoluteAxisInfo trackingId{};
+ RawAbsoluteAxisInfo slot{};
inline int32_t getRawWidth() const { return x.maxValue - x.minValue + 1; }
inline int32_t getRawHeight() const { return y.maxValue - y.minValue + 1; }