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

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

Merge "Do not access DesktopModeFlags for camera in isolated process." into main

parents 332e9d31 9a17b97d

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

+4 −1
Original line number Diff line number Diff line
@@ -1686,7 +1686,10 @@ public final class CameraManager { 
     */

    public static int getRotationOverride(@Nullable Context context,

            @Nullable PackageManager packageManager, @Nullable String packageName) {

        if (DesktopModeFlags.ENABLE_CAMERA_COMPAT_SIMULATE_REQUESTED_ORIENTATION.isTrue()) {

        // Isolated process does not have access to the ContentProvider which

        // `DesktopModeFlags` uses. `DesktopModeFlags` combines developer options and Aconfig flags.

        if (!Process.isIsolated() && DesktopModeFlags

                .ENABLE_CAMERA_COMPAT_SIMULATE_REQUESTED_ORIENTATION.isTrue()) {

            return getRotationOverrideInternal(context, packageManager, packageName);

        } else {

            return shouldOverrideToPortrait(packageManager, packageName)