Aperture: Drop non working multi-camera logical camera check
* Makes even more sense to drop it since aux cameras support is opt-in
Change-Id: I8e71a1305a74af1b897a97f7267276812dd8d18b
diff --git a/app/src/main/java/org/lineageos/aperture/utils/Camera.kt b/app/src/main/java/org/lineageos/aperture/utils/Camera.kt
index ba9d5e4..efe4631 100644
--- a/app/src/main/java/org/lineageos/aperture/utils/Camera.kt
+++ b/app/src/main/java/org/lineageos/aperture/utils/Camera.kt
@@ -69,10 +69,6 @@
val isLogical = sensors.size > 1
- val focalLengths = camera2CameraInfo.getCameraCharacteristic(
- CameraCharacteristics.LENS_INFO_AVAILABLE_FOCAL_LENGTHS
- ) ?: FloatArray(0)
-
var intrinsicZoomRatio = 1f
val logicalZoomRatios = cameraManager.getLogicalZoomRatios(cameraId)
diff --git a/app/src/main/java/org/lineageos/aperture/utils/CameraManager.kt b/app/src/main/java/org/lineageos/aperture/utils/CameraManager.kt
index 7672a48..9e53d93 100644
--- a/app/src/main/java/org/lineageos/aperture/utils/CameraManager.kt
+++ b/app/src/main/java/org/lineageos/aperture/utils/CameraManager.kt
@@ -244,13 +244,6 @@
return listOf(mainCamera)
}
- if (mainCamera.isLogical && mainCamera.focalLengths.size >= 2) {
- // If first camera is logical and it has more focal lengths,
- // it's very likely that it merges all sensors and handles
- // them with zoom (e.g. Pixels). Just expose only that
- return listOf(mainCamera)
- }
-
// Get the list of aux cameras
val auxCameras = facingCameras
.drop(1)