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

Commit 8a1be912 authored by Daniel Norman's avatar Daniel Norman
Browse files

Tracks whether an injected MotionEvent came from an accessibility tool. 

This property can be checked by the View to allow sensitive views
to ignore gestures injected by non-tool accessibility services.
Sensitive views should continue responding to gestures injected
by Accessibility Tools.

Note: The files in this change do not reference the new flag, but this
change is a no-op if the flag is not enabled. See other change in this
topic.

Bug: 284180538
Flag: android.view.accessibility.prevent_a11y_nontool_from_injecting_into_sensitive_views
Test: atest InputDispatcher_test.cpp
Test: See other change in topic for tests using this property
Change-Id: I40ba79852045aaefe84f7ab87d5e08c42509f1e7
parent c09f9fa2

include/input/Input.h

+16 −1
Original line number Diff line number Diff line
@@ -92,11 +92,23 @@ enum { 
            static_cast<int32_t>(android::os::MotionEventFlag::NO_FOCUS_CHANGE),



    /**

     * This event was generated or modified by accessibility service.

     * This event was injected from some AccessibilityService, which may be either an

     * Accessibility Tool OR a service using that API for purposes other than assisting users

     * with disabilities.

     */

    AMOTION_EVENT_FLAG_IS_ACCESSIBILITY_EVENT =

            static_cast<int32_t>(android::os::MotionEventFlag::IS_ACCESSIBILITY_EVENT),



    /**

     * This event was injected from an AccessibilityService with the

     * AccessibilityServiceInfo#isAccessibilityTool property set to true. These services (known as

     * "Accessibility Tools") are used to assist users with disabilities, so events from these

     * services should be able to reach all Views including Views which set

     * View#isAccessibilityDataSensitive to true.

     */

    AMOTION_EVENT_FLAG_INJECTED_FROM_ACCESSIBILITY_TOOL =

            static_cast<int32_t>(android::os::MotionEventFlag::INJECTED_FROM_ACCESSIBILITY_TOOL),



    AMOTION_EVENT_FLAG_TARGET_ACCESSIBILITY_FOCUS =

            static_cast<int32_t>(android::os::MotionEventFlag::TARGET_ACCESSIBILITY_FOCUS),
@@ -347,6 +359,9 @@ enum { 
    POLICY_FLAG_INJECTED_FROM_ACCESSIBILITY =

            android::os::IInputConstants::POLICY_FLAG_INJECTED_FROM_ACCESSIBILITY,



    POLICY_FLAG_INJECTED_FROM_ACCESSIBILITY_TOOL =

            android::os::IInputConstants::POLICY_FLAG_INJECTED_FROM_ACCESSIBILITY_TOOL,



    /* These flags are set by the input dispatcher. */



    // Indicates that the input event was injected.

libs/input/android/os/IInputConstants.aidl

+20 −4
Original line number Diff line number Diff line
@@ -43,8 +43,9 @@ interface IInputConstants 
    const int INVALID_INPUT_DEVICE_ID = -2;



    /**

     * The input event was injected from accessibility. Used in policyFlags for input event

     * injection.

     * The input event was injected from some AccessibilityService, which may be either an

     * Accessibility Tool OR a service using that API for purposes other than assisting users with

     * disabilities. Used in policyFlags for input event injection.

     */

    const int POLICY_FLAG_INJECTED_FROM_ACCESSIBILITY = 0x20000;
@@ -54,6 +55,15 @@ interface IInputConstants 
     */

    const int POLICY_FLAG_KEY_GESTURE_TRIGGERED = 0x40000;



    /**

     * The input event was injected from an AccessibilityService with the

     * AccessibilityServiceInfo#isAccessibilityTool property set to true. These services (known as

     * "Accessibility Tools") are used to assist users with disabilities, so events from these

     * services should be able to reach all Views including Views which set

     * View#isAccessibilityDataSensitive to true. Used in policyFlags for input event injection.

     */

    const int POLICY_FLAG_INJECTED_FROM_ACCESSIBILITY_TOOL = 0x80000;



    /**

     * Common input event flag used for both motion and key events for a gesture or pointer being

     * canceled.
@@ -61,11 +71,17 @@ interface IInputConstants 
    const int INPUT_EVENT_FLAG_CANCELED = 0x20;



    /**

     * Common input event flag used for both motion and key events, indicating that the event

     * was generated or modified by accessibility service.

     * Input event flag used for both motion and key events.

     * See POLICY_FLAG_INJECTED_FROM_ACCESSIBILITY for more information.

     */

    const int INPUT_EVENT_FLAG_IS_ACCESSIBILITY_EVENT = 0x800;



    /**

     * Input event flag used for motion events.

     * See POLICY_FLAG_INJECTED_FROM_ACCESSIBILITY_TOOL for more information.

     */

    const int INPUT_EVENT_FLAG_INJECTED_FROM_ACCESSIBILITY_TOOL = 0x1000;



    /**

     * Common input event flag used for both motion and key events, indicating that the system has

     * detected this event may be inconsistent with the current event sequence or gesture, such as

libs/input/android/os/MotionEventFlag.aidl

+14 −3
Original line number Diff line number Diff line
@@ -118,12 +118,23 @@ enum MotionEventFlag { 
    PRIVATE_FLAG_SUPPORTS_DIRECTIONAL_ORIENTATION = 0x100,



    /**

     * The input event was generated or modified by accessibility service.

     * Shared by both KeyEvent and MotionEvent flags, so this value should not overlap with either

     * set of flags, including in input/Input.h and in android/input.h.

     * The input event was injected from some AccessibilityService, which may be either an

     * Accessibility Tool OR a service using that API for purposes other than assisting users with

     * disabilities. Shared by both KeyEvent and MotionEvent flags, so this value should not

     * overlap with either set of flags, including in input/Input.h and in android/input.h.

     */

    IS_ACCESSIBILITY_EVENT = IInputConstants.INPUT_EVENT_FLAG_IS_ACCESSIBILITY_EVENT,



    /**

     * The input event was injected from an AccessibilityService with the

     * AccessibilityServiceInfo#isAccessibilityTool property set to true. These services (known as

     * "Accessibility Tools") are used to assist users with disabilities, so events from these

     * services should be able to reach all Views including Views which set

     * View#isAccessibilityDataSensitive to true. Only used by MotionEvent flags.

     */

    INJECTED_FROM_ACCESSIBILITY_TOOL =

        IInputConstants.INPUT_EVENT_FLAG_INJECTED_FROM_ACCESSIBILITY_TOOL,



    /**

     * Private flag that indicates when the system has detected that this motion event

     * may be inconsistent with respect to the sequence of previously delivered motion events,

libs/input/rust/input.rs

+3 −0
Original line number Diff line number Diff line
@@ -219,6 +219,9 @@ bitflags! { 
                MotionEventFlag::PRIVATE_FLAG_SUPPORTS_DIRECTIONAL_ORIENTATION.0 as u32;

        /// FLAG_IS_ACCESSIBILITY_EVENT

        const IS_ACCESSIBILITY_EVENT = MotionEventFlag::IS_ACCESSIBILITY_EVENT.0 as u32;

        /// FLAG_INJECTED_FROM_ACCESSIBILITY_TOOL

        const INJECTED_FROM_ACCESSIBILITY_TOOL =

                MotionEventFlag::INJECTED_FROM_ACCESSIBILITY_TOOL.0 as u32;

        /// FLAG_TAINTED

        const TAINTED = MotionEventFlag::TAINTED.0 as u32;

        /// FLAG_TARGET_ACCESSIBILITY_FOCUS

services/inputflinger/dispatcher/InputDispatcher.cpp

+4 −0
Original line number Diff line number Diff line
@@ -4870,6 +4870,10 @@ InputEventInjectionResult InputDispatcher::injectInputEvent(const InputEvent* ev 
                flags |= AMOTION_EVENT_FLAG_IS_ACCESSIBILITY_EVENT;

            }



            if (policyFlags & POLICY_FLAG_INJECTED_FROM_ACCESSIBILITY_TOOL) {

                flags |= AMOTION_EVENT_FLAG_INJECTED_FROM_ACCESSIBILITY_TOOL;

            }



            mLock.lock();



            if (shouldRejectInjectedMotionLocked(motionEvent, resolvedDeviceId, displayId,