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

Commit dcc8a7f0 authored by Mina Karadzic's avatar Mina Karadzic
Browse files

Disable tests that don't make sense with unify-policies feature. 

Flag: com.android.window.flags.camera_compat_unify_camera_policies
Bug: 440169842
Test: atest WmTests:AppCompatCameraPolicyTest
Change-Id: I94590ef6334c56d25287cb925e7fd95715d57016
parent 6bfedcb7

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

+5 −1
Original line number Diff line number Diff line
@@ -97,6 +97,7 @@ public class AppCompatCameraPolicyTest extends WindowTestsBase { 


    @Test

    @EnableFlags(FLAG_ENABLE_CAMERA_COMPAT_FOR_DESKTOP_WINDOWING)

    @DisableFlags(FLAG_CAMERA_COMPAT_UNIFY_CAMERA_POLICIES)

    public void testSimReqOrientationPolicy_notPresentWhenNoDW() {

        runTestScenario((robot) -> {

            robot.dw().allowEnterDesktopMode(/* isAllowed= */ false);
@@ -173,6 +174,7 @@ public class AppCompatCameraPolicyTest extends WindowTestsBase { 
    }



    @Test

    @DisableFlags(FLAG_CAMERA_COMPAT_UNIFY_CAMERA_POLICIES)

    public void testCameraStateManager_existsWhenDisplayRotationCompatPolicyExists() {

        runTestScenario((robot) -> {

            robot.conf().enableCameraCompatForceRotateTreatmentAtBuildTime(/* enabled= */ true);
@@ -183,6 +185,7 @@ public class AppCompatCameraPolicyTest extends WindowTestsBase { 
    }



    @Test

    @DisableFlags(FLAG_CAMERA_COMPAT_UNIFY_CAMERA_POLICIES)

    public void testCameraStateManager_startedWhenDisplayRotationCompatPolicyExists() {

        runTestScenario((robot) -> {

            robot.conf().enableCameraCompatForceRotateTreatmentAtBuildTime(/* enabled= */ true);
@@ -194,7 +197,8 @@ public class AppCompatCameraPolicyTest extends WindowTestsBase { 
    }



    @Test

    @DisableFlags(FLAG_ENABLE_CAMERA_COMPAT_FOR_DESKTOP_WINDOWING)

    @DisableFlags({FLAG_ENABLE_CAMERA_COMPAT_FOR_DESKTOP_WINDOWING,

            FLAG_CAMERA_COMPAT_UNIFY_CAMERA_POLICIES})

    public void testCameraStateManager_doesNotExistWhenNoPolicyExists() {

        runTestScenario((robot) -> {

            robot.conf().enableCameraCompatForceRotateTreatmentAtBuildTime(/* enabled= */ false);