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

Commit e1828922 authored by Sally Yuen's avatar Sally Yuen Committed by Automerger Merge Worker
Browse files

Merge "Support separating A11yManagers by device id" into udc-dev am: 1e7c22ab am: 66127231 

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



Change-Id: Ib3c3e42fb1e2ee3ebe6e40b5943b7bca9407c8b0
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 863fc87c 66127231

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

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

         */

        void onClientChangeLocked(boolean serviceInfoChanged);

        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();

        int getCurrentUserIdLocked();





        Pair<float[], MagnificationSpec> getWindowTransformationMatrixAndMagnificationSpec(

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




        void attachAccessibilityOverlayToDisplay(int displayId, SurfaceControl sc);

        void attachAccessibilityOverlayToDisplay(int displayId, SurfaceControl sc);





        void setCurrentUserFocusAppearance(int strokeWidth, int color);



    }

    }





    public AbstractAccessibilityServiceConnection(Context context, ComponentName componentName,

    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 Original line Diff line number Diff line
@@ -50,6 +50,7 @@ import java.util.List; 




public class ProxyAccessibilityServiceConnectionTest {

public class ProxyAccessibilityServiceConnectionTest {

    private static final int DISPLAY_ID = 1000;

    private static final int DISPLAY_ID = 1000;

    private static final int DEVICE_ID = 2000;

    private static final int CONNECTION_ID = 1000;

    private static final int CONNECTION_ID = 1000;

    private static final ComponentName COMPONENT_NAME = new ComponentName(

    private static final ComponentName COMPONENT_NAME = new ComponentName(

            "com.android.server.accessibility", ".ProxyAccessibilityServiceConnectionTest");

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

                mAccessibilityServiceInfo, CONNECTION_ID , new Handler(

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

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

                mMockLock, mMockSecurityPolicy, mMockSystemSupport, mMockA11yTrace,

                mMockLock, mMockSecurityPolicy, mMockSystemSupport, mMockA11yTrace,

                mMockWindowManagerInternal, mMockA11yWindowManager, DISPLAY_ID);

                mMockWindowManagerInternal, mMockA11yWindowManager, DISPLAY_ID, DEVICE_ID);

    }

    }





    @Test

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




        mProxyConnection.setInstalledAndEnabledServices(infos);

        mProxyConnection.setInstalledAndEnabledServices(infos);





        verify(mMockSystemSupport).onClientChangeLocked(true);

        verify(mMockSystemSupport).onProxyChanged(DEVICE_ID);

    }

    }





    @Test

    @Test