summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author TreeHugger Robot <treehugger-gerrit@google.com> 2021-06-16 19:27:06 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2021-06-16 19:27:06 +0000
commit58ac45d97c3aea386ae6fa0fba56eaa55b345822 (patch)
treeb57ef37b3ae7992645e241911f666eb2531cb27e
parentec8ab545a365215fff6cb86614c39522291cc52f (diff)
parent6123a6d95ded1f01784089dbb79bcfc19145560f (diff)
Merge "Avoid aidl usage on mac builds" into sc-dev am: 6123a6d95d
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/14994078 Change-Id: If993c5ef43737f73dcbfd5ba7b80c9617f533669
-rw-r--r--include/input/Input.h8
1 files changed, 7 insertions, 1 deletions
diff --git a/include/input/Input.h b/include/input/Input.h
index 7d936baf7a..e8678d27c3 100644
--- a/include/input/Input.h
+++ b/include/input/Input.h
@@ -24,7 +24,9 @@
*/
#include <android/input.h>
+#ifdef __linux__
#include <android/os/IInputConstants.h>
+#endif
#include <math.h>
#include <stdint.h>
#include <ui/Transform.h>
@@ -220,12 +222,16 @@ enum {
POLICY_FLAG_GESTURE = 0x00000008,
POLICY_FLAG_RAW_MASK = 0x0000ffff,
-
+#ifdef __linux__
POLICY_FLAG_INPUTFILTER_TRUSTED = android::os::IInputConstants::POLICY_FLAG_INPUTFILTER_TRUSTED,
POLICY_FLAG_INJECTED_FROM_ACCESSIBILITY =
android::os::IInputConstants::POLICY_FLAG_INJECTED_FROM_ACCESSIBILITY,
+#else
+ POLICY_FLAG_INPUTFILTER_TRUSTED = 0x10000,
+ POLICY_FLAG_INJECTED_FROM_ACCESSIBILITY = 0x20000,
+#endif
/* These flags are set by the input dispatcher. */
// Indicates that the input event was injected.