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

Commit ff52a643 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Avoid aidl usage on mac builds" into sc-dev am: 6123a6d9 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/14994078

Change-Id: I81235fd7df0357cc63642e9c55438e232df5a2e1
parents 45c44c99 6123a6d9

include/input/Input.h

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