Revert "Add asserts for new HAL axes in InputCommonConverter"
Revert "Add GESTURE_{X,Y}_OFFSET axes to input HAL"
Revert "Depend on V2 of the Input HAL from libservices"
Revert submission 20187666-input-hal-gesture-offset
Reason for revert: Causes build errors (https://android-build.googleplex.com/builds/submitted/9380741/sdk_finalization/latest/logs/build_error.log)
Reverted Changes:
I31e8b6975:Add GESTURE_{X,Y}_OFFSET axes to input HAL
I2eb4924f3:Depend on V2 of the Input HAL from libservices
I13d341fa0:Add asserts for new HAL axes in InputCommonConvert...
Change-Id: Ibbef9e8fc3737e418133aef70a53e9d5609bc5f6
diff --git a/services/inputflinger/InputCommonConverter.cpp b/services/inputflinger/InputCommonConverter.cpp
index 09f1c0f..6db89d4 100644
--- a/services/inputflinger/InputCommonConverter.cpp
+++ b/services/inputflinger/InputCommonConverter.cpp
@@ -263,10 +263,7 @@
static_assert(static_cast<common::Axis>(AMOTION_EVENT_AXIS_GENERIC_14) == common::Axis::GENERIC_14);
static_assert(static_cast<common::Axis>(AMOTION_EVENT_AXIS_GENERIC_15) == common::Axis::GENERIC_15);
static_assert(static_cast<common::Axis>(AMOTION_EVENT_AXIS_GENERIC_16) == common::Axis::GENERIC_16);
-static_assert(static_cast<common::Axis>(AMOTION_EVENT_AXIS_GESTURE_X_OFFSET) ==
- common::Axis::GESTURE_X_OFFSET);
-static_assert(static_cast<common::Axis>(AMOTION_EVENT_AXIS_GESTURE_Y_OFFSET) ==
- common::Axis::GESTURE_Y_OFFSET);
+// TODO(hcutts): add GESTURE_X_OFFSET and GESTURE_Y_OFFSET.
// If you added a new axis, consider whether this should also be exposed as a HAL axis. Update the
// static_assert below and add the new axis here, or leave a comment summarizing your decision.
static_assert(static_cast<common::Axis>(AMOTION_EVENT_MAXIMUM_VALID_AXIS_VALUE) ==