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

Commit 7c10201d authored by Mina Granic's avatar Mina Granic
Browse files

Revert "Separate compat checks in CameraManager." 

This reverts commit d3b06c4a.

Reason for revert: Performance regression: b/426601571.

Bug: 425491882
Fixes: 426601571
Change-Id: If8a738d80dd0ca86f3d930b6556b684bce5ff7a6
parent d3b06c4a

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

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

    public static int getRotationOverrideInternal(@Nullable Context context,

            @Nullable PackageManager packageManager, @Nullable String packageName) {

        // Check if WindowManager has requested camera compat mode.

        if (!CameraManagerGlobal.sLandscapeToPortrait) {

            return ICameraService.ROTATION_OVERRIDE_NONE;

        }



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

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

        if (context != null && !Process.isIsolated()) {
@@ -1736,11 +1739,6 @@ 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(