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

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

Merge "Disable AppTransitionControllerTest when WM Shell is enabled." into... 

Merge "Disable AppTransitionControllerTest when WM Shell is enabled." into tm-qpr-dev am: 9aebc35d

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



Change-Id: I86fc5930e48160fa4e31c8329170eb4cb4d97a91
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents d5abe8d3 9aebc35d

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);

    }