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

Commit 8a77a846 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "InputMethodSystemServerTests: Make more robust" into main

parents a3ba9e5c 2c91bb46
Loading
Loading
Loading
Loading
+2 −2
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ package com.android.server.inputmethod;
import static com.android.dx.mockito.inline.extended.ExtendedMockito.doNothing;
import static com.android.dx.mockito.inline.extended.ExtendedMockito.doReturn;
import static com.android.dx.mockito.inline.extended.ExtendedMockito.mockitoSession;
import static com.android.dx.mockito.inline.extended.ExtendedMockito.spy;
import static com.android.dx.mockito.inline.extended.ExtendedMockito.spyOn;

import static org.mockito.ArgumentMatchers.any;
@@ -145,8 +146,7 @@ public class InputMethodManagerServiceTestBase {
                        .mockStatic(SystemServerInitThreadPool.class)
                        .startMocking();

        mContext = InstrumentationRegistry.getInstrumentation().getContext();
        spyOn(mContext);
        mContext = spy(InstrumentationRegistry.getInstrumentation().getContext());

        mTargetSdkVersion = mContext.getApplicationInfo().targetSdkVersion;
        mIsLargeScreen = mContext.getResources().getConfiguration()