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

Commit bc5d5e80 authored by Daniel Norman's avatar Daniel Norman Committed by Android (Google) Code Review
Browse files

Merge "Removes isAccessibilityTool from dynamically-configurable properties."

parents 4bcadbe5 ae6b03f8

core/api/test-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -445,6 +445,7 @@ package android.app { 
    method public void syncInputTransactions();

    method public void syncInputTransactions(boolean);

    field @NonNull public static final java.util.Set<java.lang.String> ALL_PERMISSIONS;

    field public static final int FLAG_NOT_ACCESSIBILITY_TOOL = 4; // 0x4

  }



  public class UiModeManager {

core/java/android/accessibilityservice/AccessibilityServiceInfo.java

+0 −1
Original line number Diff line number Diff line
@@ -784,7 +784,6 @@ public class AccessibilityServiceInfo implements Parcelable { 
        mNonInteractiveUiTimeout = other.mNonInteractiveUiTimeout;

        mInteractiveUiTimeout = other.mInteractiveUiTimeout;

        flags = other.flags;

        mIsAccessibilityTool = other.mIsAccessibilityTool;

    }



    private boolean isRequestAccessibilityButtonChangeEnabled(IPlatformCompat platformCompat) {

core/java/android/app/UiAutomation.java

+9 −0
Original line number Diff line number Diff line
@@ -172,6 +172,15 @@ public final class UiAutomation { 
     */

    public static final int FLAG_DONT_USE_ACCESSIBILITY = 0x00000002;



    /**

     * UiAutomation sets {@link AccessibilityServiceInfo#isAccessibilityTool()} true by default.

     * This flag provides the option to set this field false for tests exercising that property.

     *

     * @hide

     */

    @TestApi

    public static final int FLAG_NOT_ACCESSIBILITY_TOOL = 0x00000004;



    /**

     * Returned by {@link #getAdoptedShellPermissions} to indicate that all permissions have been

     * adopted using {@link #adoptShellPermissionIdentity}.

core/java/android/app/UiAutomationConnection.java

+3 −1
Original line number Diff line number Diff line
@@ -558,7 +558,9 @@ public final class UiAutomationConnection extends IUiAutomationConnection.Stub { 
        info.setCapabilities(AccessibilityServiceInfo.CAPABILITY_CAN_RETRIEVE_WINDOW_CONTENT

                | AccessibilityServiceInfo.CAPABILITY_CAN_REQUEST_TOUCH_EXPLORATION

                | AccessibilityServiceInfo.CAPABILITY_CAN_REQUEST_FILTER_KEY_EVENTS);

        if ((flags & UiAutomation.FLAG_NOT_ACCESSIBILITY_TOOL) == 0) {

            info.setAccessibilityTool(true);

        }

        try {

            // Calling out with a lock held is fine since if the system

            // process is gone the client calling in will be killed.