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

Commit 347bb991 authored by Mina Karadzic's avatar Mina Karadzic Committed by Android (Google) Code Review
Browse files

Merge "Disable unify_camera_policies flag for freeform-only tests." into main

parents b7e4c5d3 9c8eaa25

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

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


import android.compat.testing.PlatformCompatChangeRule;

import android.content.pm.ActivityInfo;

import android.platform.test.annotations.DisableFlags;

import android.platform.test.annotations.EnableFlags;

import android.platform.test.annotations.Presubmit;
@@ -278,6 +279,7 @@ public class AppCompatAspectRatioOverridesTest extends WindowTestsBase { 
    }



    @Test

    @DisableFlags(Flags.FLAG_CAMERA_COMPAT_UNIFY_CAMERA_POLICIES)

    public void testGetFixedOrientationLetterboxAspectRatio_splitScreenAspectEnabled() {

        runTestScenario((robot)-> {

            robot.applyOnConf((c) -> {

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

+2 −1
Original line number Diff line number Diff line
@@ -88,6 +88,7 @@ import static com.android.server.wm.TransitionSubject.assertThat; 
import static com.android.server.wm.WindowContainer.AnimationFlags.PARENTS;

import static com.android.server.wm.WindowContainer.POSITION_TOP;

import static com.android.server.wm.WindowManagerService.UPDATE_FOCUS_NORMAL;

import static com.android.window.flags.Flags.FLAG_CAMERA_COMPAT_UNIFY_CAMERA_POLICIES;

import static com.android.window.flags.Flags.FLAG_ENABLE_CAMERA_COMPAT_FOR_DESKTOP_WINDOWING;

import static com.android.window.flags.Flags.FLAG_ENABLE_DESKTOP_WINDOWING_MODE;

import static com.android.window.flags.Flags.FLAG_ENABLE_PERSISTING_DISPLAY_SIZE_FOR_CONNECTED_DISPLAYS;
@@ -3014,7 +3015,7 @@ public class DisplayContentTests extends WindowTestsBase { 
    }



    @EnableFlags(FLAG_ENABLE_CAMERA_COMPAT_FOR_DESKTOP_WINDOWING)

    @DisableFlags(FLAG_ENABLE_DESKTOP_WINDOWING_MODE)

    @DisableFlags({FLAG_ENABLE_DESKTOP_WINDOWING_MODE, FLAG_CAMERA_COMPAT_UNIFY_CAMERA_POLICIES})

    @Test

    public void desktopWindowingFlagNotEnabled_cameraCompatFreeformPolicyIsNull() {

        assertFalse(createNewDisplay().mAppCompatCameraPolicy.hasSimReqOrientationPolicy());