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

Commit 68d52868 authored by Bryce Lee's avatar Bryce Lee Committed by Android (Google) Code Review
Browse files

Merge "Do not depend on actual WindowManagerService object."

parents d9f19a87 6a0754a9
Loading
Loading
Loading
Loading
+1 −5
Original line number Original line Diff line number Diff line
@@ -55,10 +55,6 @@ public class ActivityTestsBase {
    private final Context mContext = InstrumentationRegistry.getContext();
    private final Context mContext = InstrumentationRegistry.getContext();
    private HandlerThread mHandlerThread;
    private HandlerThread mHandlerThread;


    // Grabbing an instance of {@link WindowManagerService} creates it if not present so this must
    // be called at before any tests.
    private final WindowManagerService mWms = WindowTestUtils.getWindowManagerService(mContext);

    @Before
    @Before
    public void setUp() throws Exception {
    public void setUp() throws Exception {
        MockitoAnnotations.initMocks(this);
        MockitoAnnotations.initMocks(this);
@@ -136,7 +132,7 @@ public class ActivityTestsBase {
            mSupportsSplitScreenMultiWindow = true;
            mSupportsSplitScreenMultiWindow = true;
            mSupportsFreeformWindowManagement = true;
            mSupportsFreeformWindowManagement = true;
            mSupportsPictureInPicture = true;
            mSupportsPictureInPicture = true;
            mWindowManager = WindowTestUtils.getWindowManagerService(context);
            mWindowManager = WindowTestUtils.getMockWindowManagerService();
        }
        }


        @Override
        @Override