Merge "Fix ActivityRecordTests." into oc-dev

 *  bit FrameworksServicesTests:com.android.server.am.ActivityRecordTests

 */

@MediumTest

// TODO(b/36916522): Currently failing in CI.

// @Presubmit

@Presubmit

@RunWith(AndroidJUnit4.class)

public class ActivityRecordTests extends ActivityTestsBase {

    private final ComponentName testActivityComponent =

import android.content.pm.ApplicationInfo;

import android.content.res.Configuration;

import android.graphics.Rect;

import android.os.Handler;

import android.os.HandlerThread;

import android.os.Looper;

import android.support.test.InstrumentationRegistry;

import com.android.server.AttributeCache;

import com.android.server.wm.WindowManagerService;

import com.android.server.wm.WindowTestUtils;

import org.junit.After;

import org.junit.Before;

import org.mockito.MockitoAnnotations;

 */

public class ActivityTestsBase {

    private final Context mContext = InstrumentationRegistry.getContext();

    private static boolean sLooperPrepared;

    private Handler mHandler;

    private HandlerThread mHandlerThread;

    // Grabbing an instance of {@link WindowManagerService} creates it if not present so this must

    // be called at before any tests.

    @Before

    public void setUp() throws Exception {

        MockitoAnnotations.initMocks(this);

        if (!sLooperPrepared) {

            sLooperPrepared = true;

            Looper.prepare();

        mHandlerThread = new HandlerThread("ActivityTestsBaseThread");

        mHandlerThread.start();

    }

    @After

    public void tearDown() {

        mHandlerThread.quitSafely();

    }

    protected ActivityManagerService createActivityManagerService() {

        @Override

        protected ActivityStackSupervisor createStackSupervisor() {

            return new TestActivityStackSupervisor(this, new Handler().getLooper());

            return new TestActivityStackSupervisor(this, mHandlerThread.getLooper());

        }

    }