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

Commit 33d7e378 authored by Daniel Norman's avatar Daniel Norman
Browse files

Initialize DirectA11yConnection pid in constructor, not static. 

It is possible for the static pid variable to be initialized before the
app process is forked from Zygote, leading to the pid here differing
from the pid used by app-process queries. This causes deadlock as the
app-process query waits on itself instead of using the same-process
message handling logic that returns immediately.

Fix this by initializing the pid per instance of this class,
in the constructor.

Bug: 269765481
Test: atest AccessibilityEndToEndTest (existing tests)
Test: Run the ATF test from the attached bug
Change-Id: I83b7a6330aaf39c5994eebb4b029314d61c10544
parent 52a61a8b

core/java/android/view/accessibility/DirectAccessibilityConnection.java

+12 −10
Original line number Original line Diff line number Diff line
@@ -50,13 +50,13 @@ import android.os.RemoteException; 
class DirectAccessibilityConnection extends IAccessibilityServiceConnection.Default {

class DirectAccessibilityConnection extends IAccessibilityServiceConnection.Default {

    private final IAccessibilityInteractionConnection mAccessibilityInteractionConnection;

    private final IAccessibilityInteractionConnection mAccessibilityInteractionConnection;

    private final AccessibilityManager mAccessibilityManager;

    private final AccessibilityManager mAccessibilityManager;

    private final int mMyProcessId;





    // Fetch all views, but do not use prefetching/cache since this "connection" does not

    // Fetch all views, but do not use prefetching/cache since this "connection" does not

    // receive cache invalidation events (as it is not linked to an AccessibilityService).

    // receive cache invalidation events (as it is not linked to an AccessibilityService).

    private static final int FETCH_FLAGS =

    private static final int FETCH_FLAGS =

            AccessibilityNodeInfo.FLAG_SERVICE_REQUESTS_REPORT_VIEW_IDS

            AccessibilityNodeInfo.FLAG_SERVICE_REQUESTS_REPORT_VIEW_IDS

                    | AccessibilityNodeInfo.FLAG_SERVICE_REQUESTS_INCLUDE_NOT_IMPORTANT_VIEWS;

                    | AccessibilityNodeInfo.FLAG_SERVICE_REQUESTS_INCLUDE_NOT_IMPORTANT_VIEWS;

    private static final int PID = Process.myPid();

    private static final Region INTERACTIVE_REGION = null;

    private static final Region INTERACTIVE_REGION = null;





    DirectAccessibilityConnection(

    DirectAccessibilityConnection(
@@ -64,6 +64,7 @@ class DirectAccessibilityConnection extends IAccessibilityServiceConnection.Defa 
            AccessibilityManager accessibilityManager) {

            AccessibilityManager accessibilityManager) {

        mAccessibilityInteractionConnection = accessibilityInteractionConnection;

        mAccessibilityInteractionConnection = accessibilityInteractionConnection;

        mAccessibilityManager = accessibilityManager;

        mAccessibilityManager = accessibilityManager;

        mMyProcessId = Process.myPid();

    }

    }





    @Override

    @Override
@@ -74,8 +75,9 @@ class DirectAccessibilityConnection extends IAccessibilityServiceConnection.Defa 
        IAccessibilityManager.WindowTransformationSpec spec =

        IAccessibilityManager.WindowTransformationSpec spec =

                mAccessibilityManager.getWindowTransformationSpec(accessibilityWindowId);

                mAccessibilityManager.getWindowTransformationSpec(accessibilityWindowId);

        mAccessibilityInteractionConnection.findAccessibilityNodeInfoByAccessibilityId(

        mAccessibilityInteractionConnection.findAccessibilityNodeInfoByAccessibilityId(

                accessibilityNodeId, INTERACTIVE_REGION, interactionId, callback, FETCH_FLAGS, PID,

                accessibilityNodeId, INTERACTIVE_REGION, interactionId, callback, FETCH_FLAGS,

                threadId, spec.magnificationSpec, spec.transformationMatrix, arguments);

                mMyProcessId, threadId, spec.magnificationSpec, spec.transformationMatrix,

                arguments);

        return new String[0];

        return new String[0];

    }

    }
@@ -87,8 +89,8 @@ class DirectAccessibilityConnection extends IAccessibilityServiceConnection.Defa 
        IAccessibilityManager.WindowTransformationSpec spec =

        IAccessibilityManager.WindowTransformationSpec spec =

                mAccessibilityManager.getWindowTransformationSpec(accessibilityWindowId);

                mAccessibilityManager.getWindowTransformationSpec(accessibilityWindowId);

        mAccessibilityInteractionConnection.findAccessibilityNodeInfosByText(accessibilityNodeId,

        mAccessibilityInteractionConnection.findAccessibilityNodeInfosByText(accessibilityNodeId,

                text, INTERACTIVE_REGION, interactionId, callback, FETCH_FLAGS, PID, threadId,

                text, INTERACTIVE_REGION, interactionId, callback, FETCH_FLAGS, mMyProcessId,

                spec.magnificationSpec, spec.transformationMatrix);

                threadId, spec.magnificationSpec, spec.transformationMatrix);

        return new String[0];

        return new String[0];

    }

    }
@@ -100,8 +102,8 @@ class DirectAccessibilityConnection extends IAccessibilityServiceConnection.Defa 
        IAccessibilityManager.WindowTransformationSpec spec =

        IAccessibilityManager.WindowTransformationSpec spec =

                mAccessibilityManager.getWindowTransformationSpec(accessibilityWindowId);

                mAccessibilityManager.getWindowTransformationSpec(accessibilityWindowId);

        mAccessibilityInteractionConnection.findAccessibilityNodeInfosByViewId(accessibilityNodeId,

        mAccessibilityInteractionConnection.findAccessibilityNodeInfosByViewId(accessibilityNodeId,

                viewId, INTERACTIVE_REGION, interactionId, callback, FETCH_FLAGS, PID, threadId,

                viewId, INTERACTIVE_REGION, interactionId, callback, FETCH_FLAGS, mMyProcessId,

                spec.magnificationSpec, spec.transformationMatrix);

                threadId, spec.magnificationSpec, spec.transformationMatrix);

        return new String[0];

        return new String[0];

    }

    }
@@ -112,7 +114,7 @@ class DirectAccessibilityConnection extends IAccessibilityServiceConnection.Defa 
        IAccessibilityManager.WindowTransformationSpec spec =

        IAccessibilityManager.WindowTransformationSpec spec =

                mAccessibilityManager.getWindowTransformationSpec(accessibilityWindowId);

                mAccessibilityManager.getWindowTransformationSpec(accessibilityWindowId);

        mAccessibilityInteractionConnection.findFocus(accessibilityNodeId, focusType,

        mAccessibilityInteractionConnection.findFocus(accessibilityNodeId, focusType,

                INTERACTIVE_REGION, interactionId, callback, FETCH_FLAGS, PID, threadId,

                INTERACTIVE_REGION, interactionId, callback, FETCH_FLAGS, mMyProcessId, threadId,

                spec.magnificationSpec, spec.transformationMatrix);

                spec.magnificationSpec, spec.transformationMatrix);

        return new String[0];

        return new String[0];

    }

    }
@@ -124,7 +126,7 @@ class DirectAccessibilityConnection extends IAccessibilityServiceConnection.Defa 
        IAccessibilityManager.WindowTransformationSpec spec =

        IAccessibilityManager.WindowTransformationSpec spec =

                mAccessibilityManager.getWindowTransformationSpec(accessibilityWindowId);

                mAccessibilityManager.getWindowTransformationSpec(accessibilityWindowId);

        mAccessibilityInteractionConnection.focusSearch(accessibilityNodeId, direction,

        mAccessibilityInteractionConnection.focusSearch(accessibilityNodeId, direction,

                INTERACTIVE_REGION, interactionId, callback, FETCH_FLAGS, PID, threadId,

                INTERACTIVE_REGION, interactionId, callback, FETCH_FLAGS, mMyProcessId, threadId,

                spec.magnificationSpec, spec.transformationMatrix);

                spec.magnificationSpec, spec.transformationMatrix);

        return new String[0];

        return new String[0];

    }

    }
@@ -135,7 +137,7 @@ class DirectAccessibilityConnection extends IAccessibilityServiceConnection.Defa 
            IAccessibilityInteractionConnectionCallback callback, long threadId)

            IAccessibilityInteractionConnectionCallback callback, long threadId)

            throws RemoteException {

            throws RemoteException {

        mAccessibilityInteractionConnection.performAccessibilityAction(accessibilityNodeId, action,

        mAccessibilityInteractionConnection.performAccessibilityAction(accessibilityNodeId, action,

                arguments, interactionId, callback, FETCH_FLAGS, PID, threadId);

                arguments, interactionId, callback, FETCH_FLAGS, mMyProcessId, threadId);

        return true;

        return true;

    }

    }

}
 
}