Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e84bf3ec authored by Harry Cutts's avatar Harry Cutts Committed by Android (Google) Code Review
Browse files

Merge "Add asserts for new HAL axes in InputCommonConverter"

parents a9a058fe 6a778e81

services/inputflinger/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -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",

services/inputflinger/InputCommonConverter.cpp

+4 −1
Original line number Diff line number Diff line
@@ -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) ==

services/inputflinger/tests/fuzzers/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -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",