diff options
| author | 2025-03-31 19:18:47 +0000 | |
|---|---|---|
| committer | 2025-04-15 16:35:34 -0700 | |
| commit | b4e998105b93e9e94b312c81a6bf6abbd32ed429 (patch) | |
| tree | 2f931b8458aaa6a881e12d5247546a901e812725 | |
| parent | 2c16eb43089d359b3f81a46081f6d6d420dcbd09 (diff) | |
Do not access DesktopModeFlags for camera in isolated process.
Flag: EXEMPT simple test fix
Fixes: 405104778
Test: atest VisualQueryDetectionServiceBasicTest
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:9a17b97dba7ac0ac37e87461de2e93e92d26f2ed)
Simple fix for b/405104778.
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:b643e1f8bacb6c7e22152983f2d034624e705230)
Merged-In: I2a55b593486387838539d6a018cfa82dda5981a9
Change-Id: I2a55b593486387838539d6a018cfa82dda5981a9
| -rw-r--r-- | core/java/android/hardware/camera2/CameraManager.java | 5 |
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) |