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

Commit 413674a9 authored by Mina Granic's avatar Mina Granic Committed by Android (Google) Code Review
Browse files

Merge "Make a opt-out per-app override opt-in for camera compat freeform." into main

parents 8d2f9d62 336c0f5c

core/java/android/content/pm/ActivityInfo.java

+5 −5
Original line number Diff line number Diff line
@@ -1320,23 +1320,23 @@ public class ActivityInfo extends ComponentInfo implements Parcelable { 
            264301586L; // buganizer id



    /**

     * Excludes the packages the override is applied to from the camera compatibility treatment

     * in free-form windowing mode for fixed-orientation apps.

     * Includes the packages the override is applied to in the camera compatibility treatment in

     * free-form windowing mode for fixed-orientation apps.

     *

     * <p>In free-form windowing mode, the compatibility treatment emulates running on a portrait

     * device by letterboxing the app window and changing the camera characteristics to what apps

     * commonly expect in a portrait device: 90 and 270 degree sensor rotation for back and front

     * cameras, respectively, and setting display rotation to 0.

     *

     * <p>Use this flag to disable the compatibility treatment for apps that do not respond well to

     * the treatment.

     * <p>Use this flag to enable the compatibility treatment for apps in which camera doesn't work

     * well in freeform windowing.

     *

     * @hide

     */

    @ChangeId

    @Overridable

    @Disabled

    public static final long OVERRIDE_CAMERA_COMPAT_DISABLE_FREEFORM_WINDOWING_TREATMENT =

    public static final long OVERRIDE_CAMERA_COMPAT_ENABLE_FREEFORM_WINDOWING_TREATMENT =

            314961188L;



    /**

services/core/java/com/android/server/wm/AppCompatCameraOverrides.java

+4 −4
Original line number Diff line number Diff line
@@ -17,8 +17,8 @@ 
package com.android.server.wm;



import static android.content.pm.ActivityInfo.OVERRIDE_CAMERA_COMPAT_DISABLE_FORCE_ROTATION;

import static android.content.pm.ActivityInfo.OVERRIDE_CAMERA_COMPAT_DISABLE_FREEFORM_WINDOWING_TREATMENT;

import static android.content.pm.ActivityInfo.OVERRIDE_CAMERA_COMPAT_DISABLE_REFRESH;

import static android.content.pm.ActivityInfo.OVERRIDE_CAMERA_COMPAT_ENABLE_FREEFORM_WINDOWING_TREATMENT;

import static android.content.pm.ActivityInfo.OVERRIDE_CAMERA_COMPAT_ENABLE_REFRESH_VIA_PAUSE;

import static android.content.pm.ActivityInfo.OVERRIDE_MIN_ASPECT_RATIO_ONLY_FOR_CAMERA;

import static android.content.pm.ActivityInfo.OVERRIDE_ORIENTATION_ONLY_FOR_CAMERA;
@@ -164,12 +164,12 @@ class AppCompatCameraOverrides { 
     * <p>The treatment is enabled when the following conditions are met:

     * <ul>

     * <li>Feature flag gating the camera compatibility free-form treatment is enabled.

     * <li>Activity isn't opted out by the device manufacturer with override.

     * <li>Activity is opted in by the device manufacturer with override.

     * </ul>

     */

    boolean shouldApplyFreeformTreatmentForCameraCompat() {

        return Flags.enableCameraCompatForDesktopWindowing() && !isChangeEnabled(mActivityRecord,

                OVERRIDE_CAMERA_COMPAT_DISABLE_FREEFORM_WINDOWING_TREATMENT);

        return Flags.enableCameraCompatForDesktopWindowing() && isChangeEnabled(mActivityRecord,

                OVERRIDE_CAMERA_COMPAT_ENABLE_FREEFORM_WINDOWING_TREATMENT);

    }



    boolean isOverrideOrientationOnlyForCameraEnabled() {

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

+7 −17
Original line number Diff line number Diff line
@@ -17,8 +17,8 @@ 
package com.android.server.wm;



import static android.content.pm.ActivityInfo.OVERRIDE_CAMERA_COMPAT_DISABLE_FORCE_ROTATION;

import static android.content.pm.ActivityInfo.OVERRIDE_CAMERA_COMPAT_DISABLE_FREEFORM_WINDOWING_TREATMENT;

import static android.content.pm.ActivityInfo.OVERRIDE_CAMERA_COMPAT_DISABLE_REFRESH;

import static android.content.pm.ActivityInfo.OVERRIDE_CAMERA_COMPAT_ENABLE_FREEFORM_WINDOWING_TREATMENT;

import static android.content.pm.ActivityInfo.OVERRIDE_CAMERA_COMPAT_ENABLE_REFRESH_VIA_PAUSE;

import static android.content.pm.ActivityInfo.OVERRIDE_MIN_ASPECT_RATIO_ONLY_FOR_CAMERA;

import static android.content.pm.ActivityInfo.OVERRIDE_ORIENTATION_ONLY_FOR_CAMERA;
@@ -228,9 +228,8 @@ public class AppCompatCameraOverridesTest extends WindowTestsBase { 
    }



    @Test

    @EnableCompatChanges({OVERRIDE_CAMERA_COMPAT_DISABLE_FREEFORM_WINDOWING_TREATMENT})

    @EnableFlags(FLAG_ENABLE_CAMERA_COMPAT_FOR_DESKTOP_WINDOWING)

    public void testShouldApplyCameraCompatFreeformTreatment_overrideEnabled_returnsFalse() {

    public void testShouldApplyCameraCompatFreeformTreatment_notEnabledByOverride_returnsFalse() {

        runTestScenario((robot) -> {

            robot.activity().createActivityWithComponentInNewTask();
@@ -239,19 +238,9 @@ public class AppCompatCameraOverridesTest extends WindowTestsBase { 
    }



    @Test

    @EnableCompatChanges({OVERRIDE_CAMERA_COMPAT_DISABLE_FREEFORM_WINDOWING_TREATMENT})

    @EnableCompatChanges({OVERRIDE_CAMERA_COMPAT_ENABLE_FREEFORM_WINDOWING_TREATMENT})

    @EnableFlags(FLAG_ENABLE_CAMERA_COMPAT_FOR_DESKTOP_WINDOWING)

    public void testShouldApplyCameraCompatFreeformTreatment_disabledByOverride_returnsFalse() {

        runTestScenario((robot) -> {

            robot.activity().createActivityWithComponentInNewTask();



            robot.checkShouldApplyFreeformTreatmentForCameraCompat(false);

        });

    }



    @Test

    @EnableFlags(FLAG_ENABLE_CAMERA_COMPAT_FOR_DESKTOP_WINDOWING)

    public void testShouldApplyCameraCompatFreeformTreatment_notDisabledByOverride_returnsTrue() {

    public void testShouldApplyCameraCompatFreeformTreatment_overrideAndFlagEnabled_returnsTrue() {

        runTestScenario((robot) -> {

            robot.activity().createActivityWithComponentInNewTask();
@@ -261,8 +250,9 @@ public class AppCompatCameraOverridesTest extends WindowTestsBase { 


    @Test

    @EnableCompatChanges({OVERRIDE_ORIENTATION_ONLY_FOR_CAMERA,

            OVERRIDE_MIN_ASPECT_RATIO_ONLY_FOR_CAMERA})

    public void testShouldRecomputeConfigurationForCameraCompat() {

            OVERRIDE_MIN_ASPECT_RATIO_ONLY_FOR_CAMERA,

            OVERRIDE_CAMERA_COMPAT_ENABLE_FREEFORM_WINDOWING_TREATMENT})

    public void testShouldRecomputeConfigurationForFreeformTreatment() {

        runTestScenario((robot) -> {

            robot.conf().enableCameraCompatSplitScreenAspectRatio(true);

            robot.applyOnActivity((a) -> {

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

+37 −15
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ import static android.app.WindowConfiguration.WINDOWING_MODE_FREEFORM; 
import static android.app.WindowConfiguration.WINDOWING_MODE_FULLSCREEN;

import static android.app.servertransaction.ActivityLifecycleItem.ON_PAUSE;

import static android.app.servertransaction.ActivityLifecycleItem.ON_STOP;

import static android.content.pm.ActivityInfo.OVERRIDE_CAMERA_COMPAT_DISABLE_FREEFORM_WINDOWING_TREATMENT;

import static android.content.pm.ActivityInfo.OVERRIDE_CAMERA_COMPAT_ENABLE_FREEFORM_WINDOWING_TREATMENT;

import static android.content.pm.ActivityInfo.SCREEN_ORIENTATION_FULL_USER;

import static android.content.pm.ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE;

import static android.content.pm.ActivityInfo.SCREEN_ORIENTATION_PORTRAIT;
@@ -142,8 +142,9 @@ public class CameraCompatFreeformPolicyTests extends WindowTestsBase { 
        cameraStateMonitor.startListeningToCameraState();

    }



    @EnableFlags(FLAG_ENABLE_CAMERA_COMPAT_FOR_DESKTOP_WINDOWING)

    @Test

    @EnableFlags(FLAG_ENABLE_CAMERA_COMPAT_FOR_DESKTOP_WINDOWING)

    @EnableCompatChanges({OVERRIDE_CAMERA_COMPAT_ENABLE_FREEFORM_WINDOWING_TREATMENT})

    public void testFullscreen_doesNotActivateCameraCompatMode() {

        configureActivity(SCREEN_ORIENTATION_PORTRAIT, WINDOWING_MODE_FULLSCREEN);

        doReturn(false).when(mActivity).inFreeformWindowingMode();
@@ -153,23 +154,26 @@ public class CameraCompatFreeformPolicyTests extends WindowTestsBase { 
        assertNotInCameraCompatMode();

    }



    @EnableFlags(FLAG_ENABLE_CAMERA_COMPAT_FOR_DESKTOP_WINDOWING)

    @Test

    @EnableFlags(FLAG_ENABLE_CAMERA_COMPAT_FOR_DESKTOP_WINDOWING)

    @EnableCompatChanges({OVERRIDE_CAMERA_COMPAT_ENABLE_FREEFORM_WINDOWING_TREATMENT})

    public void testOrientationUnspecified_doesNotActivateCameraCompatMode() {

        configureActivity(SCREEN_ORIENTATION_UNSPECIFIED);



        assertNotInCameraCompatMode();

    }



    @EnableFlags(FLAG_ENABLE_CAMERA_COMPAT_FOR_DESKTOP_WINDOWING)

    @Test

    @EnableFlags(FLAG_ENABLE_CAMERA_COMPAT_FOR_DESKTOP_WINDOWING)

    @EnableCompatChanges({OVERRIDE_CAMERA_COMPAT_ENABLE_FREEFORM_WINDOWING_TREATMENT})

    public void testNoCameraConnection_doesNotActivateCameraCompatMode() {

        configureActivity(SCREEN_ORIENTATION_PORTRAIT);

        assertNotInCameraCompatMode();

    }



    @EnableFlags(FLAG_ENABLE_CAMERA_COMPAT_FOR_DESKTOP_WINDOWING)

    @Test

    @EnableFlags(FLAG_ENABLE_CAMERA_COMPAT_FOR_DESKTOP_WINDOWING)

    @EnableCompatChanges({OVERRIDE_CAMERA_COMPAT_ENABLE_FREEFORM_WINDOWING_TREATMENT})

    public void testCameraConnected_deviceInPortrait_portraitCameraCompatMode() throws Exception {

        configureActivity(SCREEN_ORIENTATION_PORTRAIT);

        setDisplayRotation(Surface.ROTATION_0);
@@ -180,6 +184,8 @@ public class CameraCompatFreeformPolicyTests extends WindowTestsBase { 
    }



    @Test

    @EnableFlags(FLAG_ENABLE_CAMERA_COMPAT_FOR_DESKTOP_WINDOWING)

    @EnableCompatChanges({OVERRIDE_CAMERA_COMPAT_ENABLE_FREEFORM_WINDOWING_TREATMENT})

    public void testCameraConnected_deviceInLandscape_portraitCameraCompatMode() throws Exception {

        configureActivity(SCREEN_ORIENTATION_PORTRAIT);

        setDisplayRotation(Surface.ROTATION_270);
@@ -190,6 +196,8 @@ public class CameraCompatFreeformPolicyTests extends WindowTestsBase { 
    }



    @Test

    @EnableFlags(FLAG_ENABLE_CAMERA_COMPAT_FOR_DESKTOP_WINDOWING)

    @EnableCompatChanges({OVERRIDE_CAMERA_COMPAT_ENABLE_FREEFORM_WINDOWING_TREATMENT})

    public void testCameraConnected_deviceInPortrait_landscapeCameraCompatMode() throws Exception {

        configureActivity(SCREEN_ORIENTATION_LANDSCAPE);

        setDisplayRotation(Surface.ROTATION_0);
@@ -200,6 +208,8 @@ public class CameraCompatFreeformPolicyTests extends WindowTestsBase { 
    }



    @Test

    @EnableFlags(FLAG_ENABLE_CAMERA_COMPAT_FOR_DESKTOP_WINDOWING)

    @EnableCompatChanges({OVERRIDE_CAMERA_COMPAT_ENABLE_FREEFORM_WINDOWING_TREATMENT})

    public void testCameraConnected_deviceInLandscape_landscapeCameraCompatMode() throws Exception {

        configureActivity(SCREEN_ORIENTATION_LANDSCAPE);

        setDisplayRotation(Surface.ROTATION_270);
@@ -209,8 +219,9 @@ public class CameraCompatFreeformPolicyTests extends WindowTestsBase { 
        assertActivityRefreshRequested(/* refreshRequested */ false);

    }



    @EnableFlags(FLAG_ENABLE_CAMERA_COMPAT_FOR_DESKTOP_WINDOWING)

    @Test

    @EnableFlags(FLAG_ENABLE_CAMERA_COMPAT_FOR_DESKTOP_WINDOWING)

    @EnableCompatChanges({OVERRIDE_CAMERA_COMPAT_ENABLE_FREEFORM_WINDOWING_TREATMENT})

    public void testCameraReconnected_cameraCompatModeAndRefresh() throws Exception {

        configureActivity(SCREEN_ORIENTATION_PORTRAIT);

        setDisplayRotation(Surface.ROTATION_270);
@@ -229,6 +240,8 @@ public class CameraCompatFreeformPolicyTests extends WindowTestsBase { 
    }



    @Test

    @EnableFlags(FLAG_ENABLE_CAMERA_COMPAT_FOR_DESKTOP_WINDOWING)

    @EnableCompatChanges({OVERRIDE_CAMERA_COMPAT_ENABLE_FREEFORM_WINDOWING_TREATMENT})

    public void testCameraOpenedForDifferentPackage_notInCameraCompatMode() {

        configureActivity(SCREEN_ORIENTATION_PORTRAIT);
@@ -239,31 +252,32 @@ public class CameraCompatFreeformPolicyTests extends WindowTestsBase { 


    @Test

    @EnableFlags(FLAG_ENABLE_CAMERA_COMPAT_FOR_DESKTOP_WINDOWING)

    @EnableCompatChanges({OVERRIDE_CAMERA_COMPAT_DISABLE_FREEFORM_WINDOWING_TREATMENT})

    public void testShouldApplyCameraCompatFreeformTreatment_overrideEnabled_returnsFalse() {

    public void testShouldApplyCameraCompatFreeformTreatment_overrideNotEnabled_returnsFalse() {

        configureActivity(SCREEN_ORIENTATION_PORTRAIT);



        mCameraAvailabilityCallback.onCameraOpened(CAMERA_ID_1, TEST_PACKAGE_1);



        assertTrue(mActivity.info

                .isChangeEnabled(OVERRIDE_CAMERA_COMPAT_DISABLE_FREEFORM_WINDOWING_TREATMENT));

        assertFalse(mCameraCompatFreeformPolicy.isTreatmentEnabledForActivity(

                mActivity, /*  checkOrientation= */ true));

        assertFalse(mCameraCompatFreeformPolicy.isTreatmentEnabledForActivity(mActivity,

                /* checkOrientation */ true));

    }



    @Test

    @EnableFlags(FLAG_ENABLE_CAMERA_COMPAT_FOR_DESKTOP_WINDOWING)

    public void testShouldApplyCameraCompatFreeformTreatment_notDisabledByOverride_returnsTrue() {

    @EnableCompatChanges(OVERRIDE_CAMERA_COMPAT_ENABLE_FREEFORM_WINDOWING_TREATMENT)

    public void testShouldApplyCameraCompatFreeformTreatment_enabledByOverride_returnsTrue() {

        configureActivity(SCREEN_ORIENTATION_PORTRAIT);



        mCameraAvailabilityCallback.onCameraOpened(CAMERA_ID_1, TEST_PACKAGE_1);



        assertTrue(mCameraCompatFreeformPolicy.isTreatmentEnabledForActivity(

                mActivity, /*  checkOrientation= */ true));

        assertTrue(mActivity.info

                .isChangeEnabled(OVERRIDE_CAMERA_COMPAT_ENABLE_FREEFORM_WINDOWING_TREATMENT));

        assertTrue(mCameraCompatFreeformPolicy.isTreatmentEnabledForActivity(mActivity,

                /* checkOrientation */ true));

    }



    @Test

    @EnableFlags(FLAG_ENABLE_CAMERA_COMPAT_FOR_DESKTOP_WINDOWING)

    @EnableCompatChanges({OVERRIDE_CAMERA_COMPAT_ENABLE_FREEFORM_WINDOWING_TREATMENT})

    public void testShouldRefreshActivity_appBoundsChanged_returnsTrue() {

        configureActivity(SCREEN_ORIENTATION_PORTRAIT);

        Configuration oldConfiguration = createConfiguration(/* letterbox= */ false);
@@ -276,6 +290,7 @@ public class CameraCompatFreeformPolicyTests extends WindowTestsBase { 


    @Test

    @EnableFlags(FLAG_ENABLE_CAMERA_COMPAT_FOR_DESKTOP_WINDOWING)

    @EnableCompatChanges({OVERRIDE_CAMERA_COMPAT_ENABLE_FREEFORM_WINDOWING_TREATMENT})

    public void testShouldRefreshActivity_displayRotationChanged_returnsTrue() {

        configureActivity(SCREEN_ORIENTATION_PORTRAIT);

        Configuration oldConfiguration = createConfiguration(/* letterbox= */ true);
@@ -291,6 +306,7 @@ public class CameraCompatFreeformPolicyTests extends WindowTestsBase { 


    @Test

    @EnableFlags(FLAG_ENABLE_CAMERA_COMPAT_FOR_DESKTOP_WINDOWING)

    @EnableCompatChanges({OVERRIDE_CAMERA_COMPAT_ENABLE_FREEFORM_WINDOWING_TREATMENT})

    public void testShouldRefreshActivity_appBoundsNorDisplayChanged_returnsFalse() {

        configureActivity(SCREEN_ORIENTATION_PORTRAIT);

        Configuration oldConfiguration = createConfiguration(/* letterbox= */ true);
@@ -306,6 +322,7 @@ public class CameraCompatFreeformPolicyTests extends WindowTestsBase { 


    @Test

    @EnableFlags(FLAG_ENABLE_CAMERA_COMPAT_FOR_DESKTOP_WINDOWING)

    @EnableCompatChanges({OVERRIDE_CAMERA_COMPAT_ENABLE_FREEFORM_WINDOWING_TREATMENT})

    public void testOnActivityConfigurationChanging_refreshDisabledViaFlag_noRefresh()

            throws Exception {

        configureActivity(SCREEN_ORIENTATION_PORTRAIT);
@@ -321,6 +338,7 @@ public class CameraCompatFreeformPolicyTests extends WindowTestsBase { 


    @Test

    @EnableFlags(FLAG_ENABLE_CAMERA_COMPAT_FOR_DESKTOP_WINDOWING)

    @EnableCompatChanges({OVERRIDE_CAMERA_COMPAT_ENABLE_FREEFORM_WINDOWING_TREATMENT})

    public void testOnActivityConfigurationChanging_cycleThroughStopDisabled() throws Exception {

        when(mAppCompatConfiguration.isCameraCompatRefreshCycleThroughStopEnabled())

                .thenReturn(false);
@@ -335,6 +353,7 @@ public class CameraCompatFreeformPolicyTests extends WindowTestsBase { 


    @Test

    @EnableFlags(FLAG_ENABLE_CAMERA_COMPAT_FOR_DESKTOP_WINDOWING)

    @EnableCompatChanges({OVERRIDE_CAMERA_COMPAT_ENABLE_FREEFORM_WINDOWING_TREATMENT})

    public void testOnActivityConfigurationChanging_cycleThroughStopDisabledForApp()

            throws Exception {

        configureActivity(SCREEN_ORIENTATION_PORTRAIT);
@@ -349,6 +368,7 @@ public class CameraCompatFreeformPolicyTests extends WindowTestsBase { 


    @Test

    @EnableFlags(FLAG_ENABLE_CAMERA_COMPAT_FOR_DESKTOP_WINDOWING)

    @EnableCompatChanges({OVERRIDE_CAMERA_COMPAT_ENABLE_FREEFORM_WINDOWING_TREATMENT})

    public void testGetCameraCompatAspectRatio_activityNotInCameraCompat_returnsDefaultAspRatio() {

        configureActivity(SCREEN_ORIENTATION_FULL_USER);
@@ -362,6 +382,7 @@ public class CameraCompatFreeformPolicyTests extends WindowTestsBase { 


    @Test

    @EnableFlags(FLAG_ENABLE_CAMERA_COMPAT_FOR_DESKTOP_WINDOWING)

    @EnableCompatChanges({OVERRIDE_CAMERA_COMPAT_ENABLE_FREEFORM_WINDOWING_TREATMENT})

    public void testGetCameraCompatAspectRatio_activityInCameraCompat_returnsConfigAspectRatio() {

        configureActivity(SCREEN_ORIENTATION_PORTRAIT);

        final float configAspectRatio = 1.5f;
@@ -377,6 +398,7 @@ public class CameraCompatFreeformPolicyTests extends WindowTestsBase { 


    @Test

    @EnableFlags(FLAG_ENABLE_CAMERA_COMPAT_FOR_DESKTOP_WINDOWING)

    @EnableCompatChanges({OVERRIDE_CAMERA_COMPAT_ENABLE_FREEFORM_WINDOWING_TREATMENT})

    public void testGetCameraCompatAspectRatio_inCameraCompatPerAppOverride_returnDefAspectRatio() {

        configureActivity(SCREEN_ORIENTATION_PORTRAIT);

        final float configAspectRatio = 1.5f;