Merge "Separate compat checks in CameraManager." into main (590bf354) · Commits · e / os / android_frameworks_base

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

+5 −4

Original line number	Diff line number	Diff line
		@@ -1698,10 +1698,6 @@ public final class CameraManager {
		@TestApi
		public static int getRotationOverride(@Nullable Context context,
		@Nullable PackageManager packageManager, @Nullable String packageName) {
		if (!CameraManagerGlobal.sLandscapeToPortrait) {
		return ICameraService.ROTATION_OVERRIDE_NONE;
		}

		if (com.android.window.flags.Flags
		.enableCameraCompatCompatibilityInfoRotateAndCropBugfix()) {
		if (isCameraCompatModeRequested()) {
		@@ -1732,6 +1728,11 @@ public final class CameraManager {
		}
		}

		if (!CameraManagerGlobal.sLandscapeToPortrait) {
		// No override and crop, and no change to sensor orientation.
		return ICameraService.ROTATION_OVERRIDE_NONE;
		}

		if (packageManager != null && packageName != null) {
		try {
		return getLandscapeToPortraitOverride(packageManager.getProperty(