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

Commit 1943e8f2 authored by Pragya Bajoria's avatar Pragya Bajoria Committed by Android (Google) Code Review
Browse files

Merge "Add SetFlagsRule to FreeformTaskListenerTests since the current...

Merge "Add SetFlagsRule to FreeformTaskListenerTests since the current flagging system is not working in this test." into main
parents 536f46fe b09ad7c1
Loading
Loading
Loading
Loading
+5 −0
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ import static org.mockito.Mockito.when;

import android.app.ActivityManager;
import android.platform.test.annotations.EnableFlags;
import android.platform.test.flag.junit.SetFlagsRule;
import android.view.SurfaceControl;

import androidx.test.ext.junit.runners.AndroidJUnit4;
@@ -49,6 +50,7 @@ import com.android.wm.shell.windowdecor.WindowDecorViewModel;

import org.junit.After;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
@@ -65,6 +67,9 @@ import java.util.Optional;
@RunWith(AndroidJUnit4.class)
public final class FreeformTaskListenerTests extends ShellTestCase {

    @Rule
    public final SetFlagsRule setFlagsRule = new SetFlagsRule();

    @Mock
    private ShellTaskOrganizer mTaskOrganizer;
    @Mock