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

Commit 08a44385 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Fix A11yManagerServiceTest by passing in the test handler."

parents 20eda2eb b9d9e629

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

+4 −3
Original line number Diff line number Diff line
@@ -258,7 +258,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;
@@ -412,6 +412,7 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub 
    @VisibleForTesting

    AccessibilityManagerService(

            Context context,

            Handler handler,

            PackageManager packageManager,

            AccessibilitySecurityPolicy securityPolicy,

            SystemActionPerformer systemActionPerformer,
@@ -425,7 +426,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;
@@ -4123,7 +4124,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
@@ -189,6 +189,7 @@ public class AccessibilityManagerServiceTest { 


        mA11yms = new AccessibilityManagerService(

                mTestableContext,

                mHandler,

                mMockPackageManager,

                mMockSecurityPolicy,

                mMockSystemActionPerformer,
@@ -371,6 +372,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());