diff options
| author | 2022-12-07 18:16:24 +0000 | |
|---|---|---|
| committer | 2022-12-07 18:16:24 +0000 | |
| commit | e84bf3ec54f6f555a8294a40e8e98704b2c8de91 (patch) | |
| tree | 8b6b968fae9d2757850bbcb5680a4cade150daca | |
| parent | a9a058feb8814df2e904c645a05b78b9feac628c (diff) | |
| parent | 6a778e81cd549ed9dfc11b7b59a86f796b33c300 (diff) | |
Merge "Add asserts for new HAL axes in InputCommonConverter"
| -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, 6 insertions, 3 deletions
diff --git a/services/inputflinger/Android.bp b/services/inputflinger/Android.bp index b8854352ad..973986f06c 100644 --- a/services/inputflinger/Android.bp +++ b/services/inputflinger/Android.bp @@ -70,7 +70,7 @@ cc_defaults { name: "libinputflinger_defaults", srcs: [":libinputflinger_sources"], shared_libs: [ - "android.hardware.input.processor-V1-ndk", + "android.hardware.input.processor-V2-ndk", "libbase", "libbinder", "libbinder_ndk", diff --git a/services/inputflinger/InputCommonConverter.cpp b/services/inputflinger/InputCommonConverter.cpp index 628ce6fc9a..b292c09350 100644 --- a/services/inputflinger/InputCommonConverter.cpp +++ b/services/inputflinger/InputCommonConverter.cpp @@ -263,7 +263,10 @@ 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); -// TODO(hcutts): add GESTURE_X_OFFSET and GESTURE_Y_OFFSET. +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); // 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 55c2db6c91..4359a4b7fb 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-V1-ndk", + "android.hardware.input.processor-V2-ndk", "libbase", "libbinder", "libcutils", |