Merge cherrypicks of ['googleplex-android-review.googlesource.com/32825845'] into 25Q2-release.

Change-Id: If5c908aa8b99865ac290abeb6f7d7db4028b889e

1 files changed, 4 insertions, 1 deletions

diff --git a/core/java/android/hardware/camera2/CameraManager.java b/core/java/android/hardware/camera2/CameraManager.java
index 335448bf131e..6a61c4263d4c 100644
--- a/core/java/android/hardware/camera2/CameraManager.java
+++ b/core/java/android/hardware/camera2/CameraManager.java
@@ -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)