diff --git a/app/build.gradle b/app/build.gradle index d85d17e..3cb808b 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -72,10 +72,10 @@ dependencies { implementation "androidx.concurrent:concurrent-futures:1.1.0" - def camerax_v1 = "1.1.0-alpha09" + def camerax_v1 = "1.1.0-alpha10" implementation "androidx.camera:camera-camera2:$camerax_v1" implementation "androidx.camera:camera-lifecycle:$camerax_v1" - def camerax_v2 = "1.0.0-alpha29" + def camerax_v2 = "1.0.0-alpha30" implementation "androidx.camera:camera-view:$camerax_v2" implementation "androidx.camera:camera-extensions:$camerax_v2" } diff --git a/app/src/main/java/sushi/hardcore/droidfs/video_recording/VideoCapture.java b/app/src/main/java/sushi/hardcore/droidfs/video_recording/VideoCapture.java index e0d4f96..22a6dbf 100644 --- a/app/src/main/java/sushi/hardcore/droidfs/video_recording/VideoCapture.java +++ b/app/src/main/java/sushi/hardcore/droidfs/video_recording/VideoCapture.java @@ -22,7 +22,6 @@ import static androidx.camera.core.impl.ImageOutputConfig.OPTION_SUPPORTED_RESOL import static androidx.camera.core.impl.ImageOutputConfig.OPTION_TARGET_ASPECT_RATIO; import static androidx.camera.core.impl.ImageOutputConfig.OPTION_TARGET_RESOLUTION; import static androidx.camera.core.impl.ImageOutputConfig.OPTION_TARGET_ROTATION; -import static androidx.camera.core.impl.UseCaseConfig.OPTION_ATTACHED_USE_CASES_UPDATE_LISTENER; import static androidx.camera.core.impl.UseCaseConfig.OPTION_CAMERA_SELECTOR; import static androidx.camera.core.impl.UseCaseConfig.OPTION_CAPTURE_CONFIG_UNPACKER; import static androidx.camera.core.impl.UseCaseConfig.OPTION_DEFAULT_CAPTURE_CONFIG; @@ -97,7 +96,6 @@ import androidx.camera.core.impl.utils.executor.CameraXExecutors; import androidx.camera.core.internal.ThreadConfig; import androidx.concurrent.futures.CallbackToFutureAdapter; import androidx.concurrent.futures.CallbackToFutureAdapter.Completer; -import androidx.core.util.Consumer; import androidx.core.util.Preconditions; import com.google.common.util.concurrent.ListenableFuture; @@ -107,7 +105,6 @@ import java.io.IOException; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.nio.ByteBuffer; -import java.util.Collection; import java.util.List; import java.util.UUID; import java.util.concurrent.Executor; @@ -123,6 +120,7 @@ import java.util.concurrent.atomic.AtomicReference; * * @hide */ +@RequiresApi(21) // TODO(b/200306659): Remove and replace with annotation on package-info.java @SuppressLint("RestrictedApi") public final class VideoCapture extends UseCase { @@ -1733,17 +1731,6 @@ public final class VideoCapture extends UseCase { return this; } - /** @hide */ - @RestrictTo(Scope.LIBRARY_GROUP) - @Override - @NonNull - public Builder setAttachedUseCasesUpdateListener( - @NonNull Consumer> attachedUseCasesUpdateListener) { - getMutableConfig().insertOption(OPTION_ATTACHED_USE_CASES_UPDATE_LISTENER, - attachedUseCasesUpdateListener); - return this; - } - } /**