Skip to content

Commit b4e9981

Browse files
minagranic-googleAndroid Build Coastguard Worker
authored andcommitted
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
1 parent 2c16eb4 commit b4e9981

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1686,7 +1686,10 @@ public static int getRotationOverride(@Nullable Context context) {
16861686
*/
16871687
public static int getRotationOverride(@Nullable Context context,
16881688
@Nullable PackageManager packageManager, @Nullable String packageName) {
1689-
if (DesktopModeFlags.ENABLE_CAMERA_COMPAT_SIMULATE_REQUESTED_ORIENTATION.isTrue()) {
1689+
// Isolated process does not have access to the ContentProvider which
1690+
// `DesktopModeFlags` uses. `DesktopModeFlags` combines developer options and Aconfig flags.
1691+
if (!Process.isIsolated() && DesktopModeFlags
1692+
.ENABLE_CAMERA_COMPAT_SIMULATE_REQUESTED_ORIENTATION.isTrue()) {
16901693
return getRotationOverrideInternal(context, packageManager, packageName);
16911694
} else {
16921695
return shouldOverrideToPortrait(packageManager, packageName)

0 commit comments

Comments
 (0)