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

Commit b9d9e629 authored by Daniel Norman's avatar Daniel Norman
Browse files

Fix A11yManagerServiceTest by passing in the test handler. 

Bug: 266114638
Test: Use go/abtd to run AccessibilityManagerServiceTest
Change-Id: I0db214863a0e210a19ada0072b9f0ef48659f4bc
parent 17a7bc4a

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

+4 −3
Original line number Diff line number Diff line
@@ -253,7 +253,7 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub 
    private final MagnificationController mMagnificationController;

    private final MagnificationProcessor mMagnificationProcessor;



    private final MainHandler mMainHandler;

    private final Handler mMainHandler;



    // Lazily initialized - access through getSystemActionPerformer()

    private SystemActionPerformer mSystemActionPerformer;
@@ -407,6 +407,7 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub 
    @VisibleForTesting

    AccessibilityManagerService(

            Context context,

            Handler handler,

            PackageManager packageManager,

            AccessibilitySecurityPolicy securityPolicy,

            SystemActionPerformer systemActionPerformer,
@@ -420,7 +421,7 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub 
        mWindowManagerService = LocalServices.getService(WindowManagerInternal.class);

        mTraceManager = AccessibilityTraceManager.getInstance(

                mWindowManagerService.getAccessibilityController(), this, mLock);

        mMainHandler = new MainHandler(mContext.getMainLooper());

        mMainHandler = handler;

        mActivityTaskManagerService = LocalServices.getService(ActivityTaskManagerInternal.class);

        mPackageManager = packageManager;

        mSecurityPolicy = securityPolicy;
@@ -4027,7 +4028,7 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub 
        private final ArrayList<Display> mDisplaysList = new ArrayList<>();

        private int mSystemUiUid = 0;



        AccessibilityDisplayListener(Context context, MainHandler handler) {

        AccessibilityDisplayListener(Context context, Handler handler) {

            mDisplayManager = (DisplayManager) context.getSystemService(Context.DISPLAY_SERVICE);

            mDisplayManager.registerDisplayListener(this, handler);

            initializeDisplayList();

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

+2 −0
Original line number Diff line number Diff line
@@ -182,6 +182,7 @@ public class AccessibilityManagerServiceTest { 


        mA11yms = new AccessibilityManagerService(

                mTestableContext,

                mHandler,

                mMockPackageManager,

                mMockSecurityPolicy,

                mMockSystemActionPerformer,
@@ -364,6 +365,7 @@ public class AccessibilityManagerServiceTest { 
        );



        mA11yms.onMagnificationTransitionEndedLocked(Display.DEFAULT_DISPLAY, true);

        mHandler.sendAllMessages();



        ArgumentCaptor<Display> displayCaptor = ArgumentCaptor.forClass(Display.class);

        verify(mInputFilter, timeout(100)).refreshMagnificationMode(displayCaptor.capture());