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

Commit 7094b3b8 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix NPE when run the splitscreen test" into tm-qpr-dev am: c6e40030 am: 82c03075 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20296412



Change-Id: Idc7a44cf60b4980653f3d1ae1d9430eff84e7e2a
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 1a9a51e0 82c03075

libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/splitscreen/SplitScreenControllerTests.java

+5 −0
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ import android.content.ComponentName; 
import android.content.Intent;

import android.content.pm.ActivityInfo;



import androidx.test.annotation.UiThreadTest;

import androidx.test.ext.junit.runners.AndroidJUnit4;

import androidx.test.filters.SmallTest;
@@ -110,6 +111,7 @@ public class SplitScreenControllerTests extends ShellTestCase { 
    }



    @Test

    @UiThreadTest

    public void instantiateController_registerDumpCallback() {

        doReturn(mMainExecutor).when(mTaskOrganizer).getExecutor();

        when(mDisplayController.getDisplayLayout(anyInt())).thenReturn(new DisplayLayout());
@@ -118,6 +120,7 @@ public class SplitScreenControllerTests extends ShellTestCase { 
    }



    @Test

    @UiThreadTest

    public void instantiateController_registerCommandCallback() {

        doReturn(mMainExecutor).when(mTaskOrganizer).getExecutor();

        when(mDisplayController.getDisplayLayout(anyInt())).thenReturn(new DisplayLayout());
@@ -126,6 +129,7 @@ public class SplitScreenControllerTests extends ShellTestCase { 
    }



    @Test

    @UiThreadTest

    public void testControllerRegistersKeyguardChangeListener() {

        doReturn(mMainExecutor).when(mTaskOrganizer).getExecutor();

        when(mDisplayController.getDisplayLayout(anyInt())).thenReturn(new DisplayLayout());
@@ -134,6 +138,7 @@ public class SplitScreenControllerTests extends ShellTestCase { 
    }



    @Test

    @UiThreadTest

    public void instantiateController_addExternalInterface() {

        doReturn(mMainExecutor).when(mTaskOrganizer).getExecutor();

        when(mDisplayController.getDisplayLayout(anyInt())).thenReturn(new DisplayLayout());

libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/splitscreen/StageCoordinatorTests.java

+2 −0
Original line number Diff line number Diff line
@@ -50,6 +50,7 @@ import android.view.SurfaceSession; 
import android.window.WindowContainerToken;

import android.window.WindowContainerTransaction;



import androidx.test.annotation.UiThreadTest;

import androidx.test.ext.junit.runners.AndroidJUnit4;

import androidx.test.filters.SmallTest;
@@ -113,6 +114,7 @@ public class StageCoordinatorTests extends ShellTestCase { 
    private StageCoordinator mStageCoordinator;



    @Before

    @UiThreadTest

    public void setup() {

        MockitoAnnotations.initMocks(this);

        mStageCoordinator = spy(new StageCoordinator(mContext, DEFAULT_DISPLAY, mSyncQueue,