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

Commit 1e7c22ab authored by Sally Yuen's avatar Sally Yuen Committed by Android (Google) Code Review
Browse files

Merge "Support separating A11yManagers by device id" into udc-dev

parents 4c62f6be fd24f601

services/accessibility/java/com/android/server/accessibility/AbstractAccessibilityServiceConnection.java

+8 −2
Original line number Diff line number Diff line
@@ -271,6 +271,14 @@ abstract class AbstractAccessibilityServiceConnection extends IAccessibilityServ 
         */

        void onClientChangeLocked(boolean serviceInfoChanged);



        /**

         * Called back to notify the system the proxy client for a device has changed.

         *

         * Changes include if the proxy is unregistered, if its service info list has changed, or if

         * its focus appearance has changed.

         */

        void onProxyChanged(int deviceId);



        int getCurrentUserIdLocked();



        Pair<float[], MagnificationSpec> getWindowTransformationMatrixAndMagnificationSpec(
@@ -315,8 +323,6 @@ abstract class AbstractAccessibilityServiceConnection extends IAccessibilityServ 


        void attachAccessibilityOverlayToDisplay(int displayId, SurfaceControl sc);



        void setCurrentUserFocusAppearance(int strokeWidth, int color);



    }



    public AbstractAccessibilityServiceConnection(Context context, ComponentName componentName,

services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java

+222 −70

File changed.

Preview size limit exceeded, changes collapsed.

services/accessibility/java/com/android/server/accessibility/ProxyAccessibilityServiceConnection.java

+51 −8

File changed.

Preview size limit exceeded, changes collapsed.

services/accessibility/java/com/android/server/accessibility/ProxyManager.java

+604 −66

File changed.

Preview size limit exceeded, changes collapsed.

services/tests/servicestests/src/com/android/server/accessibility/ProxyAccessibilityServiceConnectionTest.java

+3 −2
Original line number Diff line number Diff line
@@ -50,6 +50,7 @@ import java.util.List; 


public class ProxyAccessibilityServiceConnectionTest {

    private static final int DISPLAY_ID = 1000;

    private static final int DEVICE_ID = 2000;

    private static final int CONNECTION_ID = 1000;

    private static final ComponentName COMPONENT_NAME = new ComponentName(

            "com.android.server.accessibility", ".ProxyAccessibilityServiceConnectionTest");
@@ -90,7 +91,7 @@ public class ProxyAccessibilityServiceConnectionTest { 
                mAccessibilityServiceInfo, CONNECTION_ID , new Handler(

                        getInstrumentation().getContext().getMainLooper()),

                mMockLock, mMockSecurityPolicy, mMockSystemSupport, mMockA11yTrace,

                mMockWindowManagerInternal, mMockA11yWindowManager, DISPLAY_ID);

                mMockWindowManagerInternal, mMockA11yWindowManager, DISPLAY_ID, DEVICE_ID);

    }



    @Test
@@ -101,7 +102,7 @@ public class ProxyAccessibilityServiceConnectionTest { 


        mProxyConnection.setInstalledAndEnabledServices(infos);



        verify(mMockSystemSupport).onClientChangeLocked(true);

        verify(mMockSystemSupport).onProxyChanged(DEVICE_ID);

    }



    @Test