Merge "Make ClientLifecycleManagerTests thread safe" into main

package com.android.server.wm;

import static android.platform.test.flag.junit.SetFlagsRule.DefaultInitValueType.DEVICE_DEFAULT;

import static com.android.dx.mockito.inline.extended.ExtendedMockito.spy;

import static com.android.dx.mockito.inline.extended.ExtendedMockito.spyOn;

import static com.android.dx.mockito.inline.extended.ExtendedMockito.verify;

import android.os.IBinder;

import android.os.RemoteException;

import android.platform.test.annotations.Presubmit;

import android.platform.test.flag.junit.SetFlagsRule;

import androidx.test.filters.SmallTest;

import org.junit.Before;

import org.junit.Rule;

import org.junit.Test;

import org.junit.runner.RunWith;

import org.mockito.ArgumentCaptor;

import org.mockito.Captor;

import org.mockito.Mock;

 */

@SmallTest

@Presubmit

public class ClientLifecycleManagerTests {

    @Rule(order = 0)

    public final SetFlagsRule mSetFlagsRule = new SetFlagsRule(DEVICE_DEFAULT);

    @Rule(order = 1)

    public final SystemServicesTestRule mSystemServices = new SystemServicesTestRule();

@RunWith(WindowTestRunner.class)

public class ClientLifecycleManagerTests extends SystemServiceTestsBase {

    @Mock

    private IBinder mClientBinder;

    public void setup() {

        MockitoAnnotations.initMocks(this);

        mWms = mSystemServices.getWindowManagerService();

        mWms = mSystemServicesTestRule.getWindowManagerService();

        mLifecycleManager = spy(new ClientLifecycleManager());

        mLifecycleManager.setWindowManager(mWms);