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

Commit 9aebc35d authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Disable AppTransitionControllerTest when WM Shell is enabled." into tm-qpr-dev

parents 4f58e036 1454947a

services/tests/wmtests/src/com/android/server/wm/AppTransitionControllerTest.java

+2 −0
Original line number Diff line number Diff line
@@ -47,6 +47,7 @@ import static org.junit.Assert.assertFalse; 
import static org.junit.Assert.assertNull;

import static org.junit.Assert.assertTrue;

import static org.junit.Assert.fail;

import static org.junit.Assume.assumeFalse;

import static org.mockito.ArgumentMatchers.any;

import static org.mockito.ArgumentMatchers.anyInt;

import static org.mockito.Mockito.clearInvocations;
@@ -89,6 +90,7 @@ public class AppTransitionControllerTest extends WindowTestsBase { 


    @Before

    public void setUp() throws Exception {

        assumeFalse(WindowManagerService.sEnableShellTransitions);

        mAppTransitionController = new AppTransitionController(mWm, mDisplayContent);

    }