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

Commit d3b06c4a authored by Mina Granic's avatar Mina Granic
Browse files

Separate compat checks in CameraManager. 

Existing config check should only be used for the static treatment.
Camera compat "simulate requested orientation" treatment (aka 'dynamic'
or 'freeform') has its own config in the window manager, which can
disable the feature.

Flag: EXEMPT simple refactoring.
Test: manual
Bug: 425491882
Fixes: 422972544
Change-Id: I18f2afcd468aeb1438e48590d51f5a1bbd0ae136
parent 66d5b0bb

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

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

    public static int getRotationOverrideInternal(@Nullable Context context,

            @Nullable PackageManager packageManager, @Nullable String packageName) {

        if (!CameraManagerGlobal.sLandscapeToPortrait) {

            return ICameraService.ROTATION_OVERRIDE_NONE;

        }



        // Check if WindowManager has requested camera compat mode.

        // Isolated process does not have access to ActivityTaskManager service, which is used

        // indirectly in `ActivityManager.getAppTasks()`.

        if (context != null && !Process.isIsolated()) {
@@ -1739,6 +1736,11 @@ public final class CameraManager { 
            }

        }



        // Check static landscape-to-portrait override.

        if (!CameraManagerGlobal.sLandscapeToPortrait) {

            return ICameraService.ROTATION_OVERRIDE_NONE;

        }



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

            try {

                return packageManager.getProperty(