Merge "Unmocking SurfacePackage in...

import android.app.admin.IKeyguardClient;

import android.content.ComponentName;

import android.content.Intent;

import android.hardware.display.DisplayManager;

import android.os.Binder;

import android.os.Handler;

import android.os.RemoteException;

import android.testing.AndroidTestingRunner;

import android.testing.TestableLooper;

import android.testing.TestableLooper.RunWithLooper;

import android.testing.ViewUtils;

import android.view.Display;

import android.view.SurfaceControlViewHost;

import android.view.SurfaceView;

import android.view.View;

import org.junit.After;

import org.junit.Before;

import org.junit.Ignore;

import org.junit.Test;

import org.junit.runner.RunWith;

import org.mockito.ArgumentCaptor;

@RunWithLooper

@RunWith(AndroidTestingRunner.class)

@SmallTest

@Ignore("b/286245842")

public class AdminSecondaryLockScreenControllerTest extends SysuiTestCase {

    private static final int TARGET_USER_ID = KeyguardUpdateMonitor.getCurrentUser();

    private KeyguardSecurityCallback mKeyguardCallback;

    @Mock

    private KeyguardUpdateMonitor mUpdateMonitor;

    @Mock

    private SurfaceControlViewHost.SurfacePackage mSurfacePackage;

    @Before

        when(mKeyguardClient.queryLocalInterface(anyString())).thenReturn(mKeyguardClient);

        when(mKeyguardClient.asBinder()).thenReturn(mKeyguardClient);

        Display display = mContext.getSystemService(DisplayManager.class).getDisplay(

                Display.DEFAULT_DISPLAY);

        mSurfacePackage = (new SurfaceControlViewHost(mContext, display,

                new Binder())).getSurfacePackage();

        mTestController = new AdminSecondaryLockScreenController.Factory(

                mContext, mKeyguardSecurityContainer, mUpdateMonitor, mHandler)

                .create(mKeyguardCallback);