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

Commit be0ac417 authored by Ryan Lin's avatar Ryan Lin Committed by Android (Google) Code Review
Browse files

Merge "Fix flaky AccessibilityMagnificationTest"

parents 762bbf49 58e65f30

services/accessibility/java/com/android/server/accessibility/magnification/MagnificationController.java

+1 −1
Original line number Diff line number Diff line
@@ -578,7 +578,7 @@ public class MagnificationController implements WindowMagnificationManager.Callb 
        synchronized (mLock) {

            if (mWindowMagnificationMgr == null) {

                mWindowMagnificationMgr = new WindowMagnificationManager(mContext,

                        mUserId, this, mAms.getTraceManager(),

                        mLock, this, mAms.getTraceManager(),

                        mScaleProvider);

            }

            return mWindowMagnificationMgr;

services/accessibility/java/com/android/server/accessibility/magnification/WindowMagnificationManager.java

+3 −2
Original line number Diff line number Diff line
@@ -87,7 +87,7 @@ public class WindowMagnificationManager implements 
    })

    public @interface WindowPosition {}



    private final Object mLock = new Object();

    private final Object mLock;

    private final Context mContext;

    @VisibleForTesting

    @GuardedBy("mLock")
@@ -152,9 +152,10 @@ public class WindowMagnificationManager implements 
    private final AccessibilityTraceManager mTrace;

    private final MagnificationScaleProvider mScaleProvider;



    public WindowMagnificationManager(Context context, int userId, @NonNull Callback callback,

    public WindowMagnificationManager(Context context, Object lock, @NonNull Callback callback,

            AccessibilityTraceManager trace, MagnificationScaleProvider scaleProvider) {

        mContext = context;

        mLock = lock;

        mCallback = callback;

        mTrace = trace;

        mScaleProvider = scaleProvider;

services/tests/servicestests/src/com/android/server/accessibility/magnification/MagnificationControllerTest.java

+3 −2
Original line number Diff line number Diff line
@@ -125,6 +125,7 @@ public class MagnificationControllerTest { 
    public void setUp() throws Exception {

        MockitoAnnotations.initMocks(this);

        FakeSettingsProvider.clearSettingsProvider();

        final Object globalLock = new Object();



        LocalServices.removeServiceForTest(WindowManagerInternal.class);

        LocalServices.addService(WindowManagerInternal.class, mMockWindowManagerInternal);
@@ -139,14 +140,14 @@ public class MagnificationControllerTest { 
                CURRENT_USER_ID);

        mScaleProvider = spy(new MagnificationScaleProvider(mContext));

        mWindowMagnificationManager = Mockito.spy(

                new WindowMagnificationManager(mContext, CURRENT_USER_ID,

                new WindowMagnificationManager(mContext, globalLock,

                        mock(WindowMagnificationManager.Callback.class), mTraceManager,

                        mScaleProvider));

        mMockConnection = new MockWindowMagnificationConnection(true);

        mWindowMagnificationManager.setConnection(mMockConnection.getConnection());

        mScreenMagnificationControllerStubber = new FullScreenMagnificationControllerStubber(

                mScreenMagnificationController);

        mMagnificationController = new MagnificationController(mService, new Object(), mContext,

        mMagnificationController = new MagnificationController(mService, globalLock, mContext,

                mScreenMagnificationController, mWindowMagnificationManager, mScaleProvider);



        mMagnificationController.setMagnificationCapabilities(

services/tests/servicestests/src/com/android/server/accessibility/magnification/WindowMagnificationGestureHandlerTest.java

+1 −1
Original line number Diff line number Diff line
@@ -85,7 +85,7 @@ public class WindowMagnificationGestureHandlerTest { 
    @Before

    public void setUp() throws RemoteException {

        MockitoAnnotations.initMocks(this);

        mWindowMagnificationManager = new WindowMagnificationManager(mContext, 0,

        mWindowMagnificationManager = new WindowMagnificationManager(mContext, new Object(),

                mock(WindowMagnificationManager.Callback.class), mMockTrace,

                new MagnificationScaleProvider(mContext));

        mMockConnection = new MockWindowMagnificationConnection();

services/tests/servicestests/src/com/android/server/accessibility/magnification/WindowMagnificationManagerTest.java

+1 −1
Original line number Diff line number Diff line
@@ -94,7 +94,7 @@ public class WindowMagnificationManagerTest { 
        LocalServices.addService(StatusBarManagerInternal.class, mMockStatusBarManagerInternal);

        mResolver = new MockContentResolver();

        mMockConnection = new MockWindowMagnificationConnection();

        mWindowMagnificationManager = new WindowMagnificationManager(mContext, CURRENT_USER_ID,

        mWindowMagnificationManager = new WindowMagnificationManager(mContext, new Object(),

                mMockCallback, mMockTrace, new MagnificationScaleProvider(mContext));



        when(mContext.getContentResolver()).thenReturn(mResolver);