Loading services/tests/servicestests/src/com/android/server/am/ActivityTestsBase.java +1 −5 Original line number Original line Diff line number Diff line Loading @@ -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); Loading Loading @@ -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 Loading Loading
services/tests/servicestests/src/com/android/server/am/ActivityTestsBase.java +1 −5 Original line number Original line Diff line number Diff line Loading @@ -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); Loading Loading @@ -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 Loading