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

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

+6 −4

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

		// Check if WindowManager has requested camera compat mode.
		// Isolated process does not have access to ActivityTaskManager service, which is used
		// indirectly in `ActivityManager.getAppTasks()`.
		if (context != null && !Process.isIsolated()) {
		@@ -1739,6 +1736,11 @@ public final class CameraManager {
		}
		}

		// Check static landscape-to-portrait override.
		if (!CameraManagerGlobal.sLandscapeToPortrait) {
		return ICameraService.ROTATION_OVERRIDE_NONE;
		}

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