From 2f16e115a73aefd89f3251da405bbd4f8b7e6fa2 Mon Sep 17 00:00:00 2001 From: Max Kupriianov Date: Wed, 16 Aug 2023 14:58:44 +0200 Subject: [PATCH] [android] fix d-pad regression introduced in abcd42777f7c17559cf6eb509dc86aca63e48527 (#15601) --- input/drivers/android_input.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/input/drivers/android_input.c b/input/drivers/android_input.c index 7f5b222f77..82a6ce9599 100644 --- a/input/drivers/android_input.c +++ b/input/drivers/android_input.c @@ -67,8 +67,6 @@ enum { }; #endif -#define AINPUT_SOURCE_TOUCHSCREEN_OR_MOUSE AINPUT_SOURCE_TOUCHSCREEN|AINPUT_SOURCE_MOUSE - /* If using an SDK lower than 24 then add missing relative axis codes */ #ifndef AMOTION_EVENT_AXIS_RELATIVE_X #define AMOTION_EVENT_AXIS_RELATIVE_X 27 @@ -1564,7 +1562,7 @@ static void android_input_poll_input_default(android_input_t *android) else if ((source & AINPUT_SOURCE_STYLUS) == AINPUT_SOURCE_STYLUS) android_input_poll_event_type_motion_stylus(android, event, port, source); - else if ((source & AINPUT_SOURCE_TOUCHSCREEN_OR_MOUSE) == AINPUT_SOURCE_TOUCHSCREEN_OR_MOUSE) + else if ((source & (AINPUT_SOURCE_TOUCHSCREEN | AINPUT_SOURCE_MOUSE))) android_input_poll_event_type_motion(android, event, port, source); else