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

Commit 70a94310 authored by Mina Karadzic's avatar Mina Karadzic
Browse files

Separate compat checks in CameraManager. 

LandscapeToPortrait should only be used for landscape cameras. WindowManager requests the dynamic camera compat treatment using CameraCompatibilityInfo, and checks whether the treatment is allowed via device config before requesting it.

Flag: com.android.window.flags.enable_camera_compat_compatibility_info_rotate_and_crop_bugfix
Fixes: 435181981
Fixes: 425491882
Test: manual debugging, made sure landscape treatment cannot trigger for portrait devices
Change-Id: I360ce81ac604a956a2133115bd1cf47ae26bbffc
parent dd4a629a

core/java/android/hardware/camera2/CameraManager.java

+5 −4
Original line number Diff line number Diff line
@@ -1698,10 +1698,6 @@ public final class CameraManager { 
    @TestApi

    public static int getRotationOverride(@Nullable Context context,

            @Nullable PackageManager packageManager, @Nullable String packageName) {

        if (!CameraManagerGlobal.sLandscapeToPortrait) {

            return ICameraService.ROTATION_OVERRIDE_NONE;

        }



        if (com.android.window.flags.Flags

                .enableCameraCompatCompatibilityInfoRotateAndCropBugfix()) {

            if (isCameraCompatModeRequested()) {
@@ -1732,6 +1728,11 @@ public final class CameraManager { 
            }

        }



        if (!CameraManagerGlobal.sLandscapeToPortrait) {

            // No override and crop, and no change to sensor orientation.

            return ICameraService.ROTATION_OVERRIDE_NONE;

        }



        if (packageManager != null && packageName != null) {

            try {

                return getLandscapeToPortraitOverride(packageManager.getProperty(