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

Commit 24f8de90 authored by Mina Karadzic's avatar Mina Karadzic
Browse files

Check after config recompute that apps is runnning on external display. 

Before applying camera compat treatment, the camera compat policy checks whether the app is eligible, but it ignores the current resolved orientation: the treatment should apply if the app has requested fixed orientation and uses camera, even if that orientation is ignored for some other reason (e.g. per-app override to change the orientation). If the app is eligible ignoring the orientation, recompute the orientation (which would apply camera compat orientation if needed) and check eligibility for the rest of the treatment.

Part of the treatment (sandboxing display orientation) is applied if the app uses camera on external display, regardless of orientation. Policy needs to make sure the app is running on external display before applying this treatment, even though it has checked before recalculating: the orientation is initially ignored, so it is possible that no treatment will be applied.

The treatent without this change still has no effect on the configuration, but might try to refresh the activity (go through stop -> resume).

Flag: EXEMPT BUGFIX
Test: atest com.google.android.camera.pts.Experimental2022Test#testMeshWarpIsForwardMesh - now passes.
Fixes: 444385257
Change-Id: Ib64df39fe5a78ffd70d6d8a72bcaad41dd2f13da
parent f759f9c9

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

+5 −4
Original line number Diff line number Diff line
@@ -279,7 +279,7 @@ final class AppCompatCameraSimReqOrientationPolicy implements AppCompatCameraSta 
                        // TODO(b/365725400): support landscape cameras.

                        .setShouldOverrideSensorOrientation(false)

                        .setShouldAllowTransformInverseDisplay(false);

            } else if (mCameraStateMonitor.isCameraRunningForActivity(activityRecord)) {

            } else if (isExternalDisplaySandboxEnabledForActivity(activityRecord)) {

                // Sandbox only display rotation if needed, for external display.

                cameraCompatibilityInfoBuilder.setDisplayRotationSandbox(

                                mCameraDisplayRotationProvider.getCameraDeviceRotation())
@@ -508,10 +508,11 @@ final class AppCompatCameraSimReqOrientationPolicy implements AppCompatCameraSta 
     * treatment is more suitable (most likely if it is a fixed-orientation activity).

     */

    boolean isExternalDisplaySandboxEnabledForActivity(@NonNull ActivityRecord activity) {

        // For compatibility apps (fixed-orientation), apply the full treatment: sandboxing display

        // rotation to match app's requested orientation, letterboxing, and rotating-and-cropping

        // the camera feed.

        if (!Flags.enableCameraCompatSandboxDisplayRotationOnExternalDisplaysBugfix()

                || !mCameraStateMonitor.isCameraRunningForActivity(activity)

                // For compatibility apps (fixed-orientation), apply the full treatment: sandboxing

                // display rotation to match app's requested orientation, letterboxing, and

                // rotating-and-cropping the camera feed.

                || isCompatibilityTreatmentEnabledForActivity(activity,

                /* checkOrientation= */ true)) {

            return false;

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

+8 −2
Original line number Diff line number Diff line
@@ -282,13 +282,19 @@ public class AppCompatCameraSimReqOrientationPolicyTests extends WindowTestsBase 
    }



    @Test

    @EnableFlags(FLAG_ENABLE_CAMERA_COMPAT_FOR_DESKTOP_WINDOWING)

    @EnableCompatChanges({OVERRIDE_CAMERA_COMPAT_ENABLE_FREEFORM_WINDOWING_TREATMENT})

    @EnableFlags({FLAG_ENABLE_CAMERA_COMPAT_FOR_DESKTOP_WINDOWING,

            FLAG_CAMERA_COMPAT_UNIFY_CAMERA_POLICIES,

            FLAG_ENABLE_CAMERA_COMPAT_EXTERNAL_DISPLAY_ROTATION_BUGFIX,

            FLAG_ENABLE_CAMERA_COMPAT_SANDBOX_DISPLAY_ROTATION_ON_EXTERNAL_DISPLAYS_BUGFIX})

    public void testOrientationUnspecified_doesNotActivateCameraCompatMode() {

        runTestScenario((robot) -> {

            robot.configureActivity(SCREEN_ORIENTATION_UNSPECIFIED);



            robot.onCameraOpened(CAMERA_ID_1, TEST_PACKAGE_1);



            robot.assertNotInCameraCompatMode();

            robot.assertActivityRefreshRequested(false);

            robot.assertActivityRefreshed(false);

        });

    }