[external/jetpack-camera-app] Remove Experimental annotations in am: 56919053eb
Original change: https://android-review.googlesource.com/c/platform/external/jetpack-camera-app/+/3377009
Change-Id: I80d3a813249abdf3d4ee780dbbb4fab93ead5c54
Signed-off-by: Automerger Merge Worker <[email protected]>
diff --git a/core/camera/src/main/java/com/google/jetpackcamera/core/camera/CameraExt.kt b/core/camera/src/main/java/com/google/jetpackcamera/core/camera/CameraExt.kt
index df24af5..8af0d9e 100644
--- a/core/camera/src/main/java/com/google/jetpackcamera/core/camera/CameraExt.kt
+++ b/core/camera/src/main/java/com/google/jetpackcamera/core/camera/CameraExt.kt
@@ -23,7 +23,6 @@
import androidx.camera.core.CameraInfo
import androidx.camera.core.CameraSelector
import androidx.camera.core.DynamicRange as CXDynamicRange
-import androidx.camera.core.ExperimentalImageCaptureOutputFormat
import androidx.camera.core.ImageCapture
import androidx.camera.core.Preview
import androidx.camera.core.UseCase
@@ -86,7 +85,6 @@
}
} ?: Float.NaN
-@OptIn(ExperimentalImageCaptureOutputFormat::class)
fun Int.toAppImageFormat(): ImageOutputFormat? {
return when (this) {
ImageCapture.OUTPUT_FORMAT_JPEG -> ImageOutputFormat.JPEG
@@ -121,7 +119,6 @@
}
val CameraInfo.supportedImageFormats: Set<ImageOutputFormat>
- @OptIn(ExperimentalImageCaptureOutputFormat::class)
get() = ImageCapture.getImageCaptureCapabilities(this).supportedOutputFormats
.mapNotNull(Int::toAppImageFormat)
.toSet()
diff --git a/core/camera/src/main/java/com/google/jetpackcamera/core/camera/CameraSession.kt b/core/camera/src/main/java/com/google/jetpackcamera/core/camera/CameraSession.kt
index fbed566..b2b446e 100644
--- a/core/camera/src/main/java/com/google/jetpackcamera/core/camera/CameraSession.kt
+++ b/core/camera/src/main/java/com/google/jetpackcamera/core/camera/CameraSession.kt
@@ -38,7 +38,6 @@
import androidx.camera.core.CameraEffect
import androidx.camera.core.CameraInfo
import androidx.camera.core.CameraSelector
-import androidx.camera.core.ExperimentalImageCaptureOutputFormat
import androidx.camera.core.FocusMeteringAction
import androidx.camera.core.ImageCapture
import androidx.camera.core.Preview
@@ -309,7 +308,6 @@
}.build()
}
-@OptIn(ExperimentalImageCaptureOutputFormat::class)
private fun createImageUseCase(
cameraInfo: CameraInfo,
aspectRatio: AspectRatio,
