diff options
| author | 2022-12-08 14:28:02 +0000 | |
|---|---|---|
| committer | 2022-12-08 14:28:27 +0000 | |
| commit | d1f18fa8bef0a319c6952040b9a7ad2a255c17c9 (patch) | |
| tree | a0e3ebef1f565839d919186480e0b4a833990a64 | |
| parent | 6a778e81cd549ed9dfc11b7b59a86f796b33c300 (diff) | |
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
| -rw-r--r-- | services/inputflinger/Android.bp | 2 | ||||
| -rw-r--r-- | services/inputflinger/InputCommonConverter.cpp | 5 | ||||
| -rw-r--r-- | services/inputflinger/tests/fuzzers/Android.bp | 2 |
3 files changed, 3 insertions, 6 deletions
diff --git a/services/inputflinger/Android.bp b/services/inputflinger/Android.bp index 8714b0397f..ddcd51f357 100644 --- a/services/inputflinger/Android.bp +++ b/services/inputflinger/Android.bp @@ -69,7 +69,7 @@ cc_defaults { name: "libinputflinger_defaults", srcs: [":libinputflinger_sources"], shared_libs: [ - "android.hardware.input.processor-V2-ndk", + "android.hardware.input.processor-V1-ndk", "libbase", "libbinder", "libbinder_ndk", diff --git a/services/inputflinger/InputCommonConverter.cpp b/services/inputflinger/InputCommonConverter.cpp index 09f1c0f6f3..6db89d4759 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_13) == common 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) == diff --git a/services/inputflinger/tests/fuzzers/Android.bp b/services/inputflinger/tests/fuzzers/Android.bp index 4359a4b7fb..55c2db6c91 100644 --- a/services/inputflinger/tests/fuzzers/Android.bp +++ b/services/inputflinger/tests/fuzzers/Android.bp @@ -55,7 +55,7 @@ cc_defaults { ], shared_libs: [ "android.hardware.input.classifier@1.0", - "android.hardware.input.processor-V2-ndk", + "android.hardware.input.processor-V1-ndk", "libbase", "libbinder", "libcutils", |