Merge "[Cleanup] Remove useless UseCaseEventCallback related code" into androidx-main

12 files changed, 2 insertions, 207 deletions

diff --git a/camera/camera-camera2-pipe-integration/src/main/java/androidx/camera/camera2/pipe/integration/impl/MeteringRepeating.kt b/camera/camera-camera2-pipe-integration/src/main/java/androidx/camera/camera2/pipe/integration/impl/MeteringRepeating.kt
index 6adbe62f8a3..c2c96415259 100644
--- a/camera/camera-camera2-pipe-integration/src/main/java/androidx/camera/camera2/pipe/integration/impl/MeteringRepeating.kt
+++ b/camera/camera-camera2-pipe-integration/src/main/java/androidx/camera/camera2/pipe/integration/impl/MeteringRepeating.kt
@@ -212,8 +212,6 @@ class MeteringRepeating(
 
         override fun setTargetName(targetName: String) = this
 
-        override fun setUseCaseEventCallback(eventCallback: EventCallback) = this
-
         override fun setDefaultSessionConfig(sessionConfig: SessionConfig) = this
 
         override fun setDefaultCaptureConfig(captureConfig: CaptureConfig) = this
diff --git a/camera/camera-core/src/androidTest/java/androidx/camera/core/FakeOtherUseCaseConfig.java b/camera/camera-core/src/androidTest/java/androidx/camera/core/FakeOtherUseCaseConfig.java
index 39158ed3711..99783c76289 100644
--- a/camera/camera-core/src/androidTest/java/androidx/camera/core/FakeOtherUseCaseConfig.java
+++ b/camera/camera-core/src/androidTest/java/androidx/camera/core/FakeOtherUseCaseConfig.java
@@ -167,14 +167,6 @@ public class FakeOtherUseCaseConfig implements UseCaseConfig<FakeOtherUseCase> {
         }
 
         @RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
-        @Override
-        @NonNull
-        public Builder setUseCaseEventCallback(@NonNull UseCase.EventCallback eventCallback) {
-            getMutableConfig().insertOption(OPTION_USE_CASE_EVENT_CALLBACK, eventCallback);
-            return this;
-        }
-
-        @RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
         @NonNull
         @Override
         public Builder setZslDisabled(boolean disabled) {
diff --git a/camera/camera-core/src/main/java/androidx/camera/core/ImageAnalysis.java b/camera/camera-core/src/main/java/androidx/camera/core/ImageAnalysis.java
index cdf3bafe8ac..798ba627e8e 100644
--- a/camera/camera-core/src/main/java/androidx/camera/core/ImageAnalysis.java
+++ b/camera/camera-core/src/main/java/androidx/camera/core/ImageAnalysis.java
@@ -40,7 +40,6 @@ import static androidx.camera.core.impl.UseCaseConfig.OPTION_SESSION_CONFIG_UNPA
 import static androidx.camera.core.impl.UseCaseConfig.OPTION_SURFACE_OCCUPANCY_PRIORITY;
 import static androidx.camera.core.impl.UseCaseConfig.OPTION_TARGET_CLASS;
 import static androidx.camera.core.impl.UseCaseConfig.OPTION_TARGET_NAME;
-import static androidx.camera.core.impl.UseCaseConfig.OPTION_USE_CASE_EVENT_CALLBACK;
 import static androidx.camera.core.impl.UseCaseConfig.OPTION_ZSL_DISABLED;
 import static androidx.camera.core.internal.ThreadConfig.OPTION_BACKGROUND_EXECUTOR;
 
@@ -1570,15 +1569,6 @@ public final class ImageAnalysis extends UseCase {
             return this;
         }
 
-        @RestrictTo(Scope.LIBRARY_GROUP)
-        @Override
-        @NonNull
-        public Builder setUseCaseEventCallback(
-                @NonNull UseCase.EventCallback useCaseEventCallback) {
-            getMutableConfig().insertOption(OPTION_USE_CASE_EVENT_CALLBACK, useCaseEventCallback);
-            return this;
-        }
-
         @NonNull
         @RestrictTo(Scope.LIBRARY_GROUP)
         public Builder setImageReaderProxyProvider(
diff --git a/camera/camera-core/src/main/java/androidx/camera/core/ImageCapture.java b/camera/camera-core/src/main/java/androidx/camera/core/ImageCapture.java
index 74a3b40268e..3910a363ec9 100644
--- a/camera/camera-core/src/main/java/androidx/camera/core/ImageCapture.java
+++ b/camera/camera-core/src/main/java/androidx/camera/core/ImageCapture.java
@@ -43,7 +43,6 @@ import static androidx.camera.core.impl.ImageCaptureConfig.OPTION_TARGET_CLASS;
 import static androidx.camera.core.impl.ImageCaptureConfig.OPTION_TARGET_NAME;
 import static androidx.camera.core.impl.ImageCaptureConfig.OPTION_TARGET_RESOLUTION;
 import static androidx.camera.core.impl.ImageCaptureConfig.OPTION_TARGET_ROTATION;
-import static androidx.camera.core.impl.ImageCaptureConfig.OPTION_USE_CASE_EVENT_CALLBACK;
 import static androidx.camera.core.impl.ImageCaptureConfig.OPTION_USE_SOFTWARE_JPEG_ENCODER;
 import static androidx.camera.core.impl.ImageInputConfig.OPTION_INPUT_DYNAMIC_RANGE;
 import static androidx.camera.core.impl.ImageInputConfig.OPTION_INPUT_FORMAT;
@@ -2871,15 +2870,6 @@ public final class ImageCapture extends UseCase {
             return this;
         }
 
-        @RestrictTo(Scope.LIBRARY_GROUP)
-        @Override
-        @NonNull
-        public Builder setUseCaseEventCallback(
-                @NonNull UseCase.EventCallback useCaseEventCallback) {
-            getMutableConfig().insertOption(OPTION_USE_CASE_EVENT_CALLBACK, useCaseEventCallback);
-            return this;
-        }
-
         /**
          * {@inheritDoc}
          */
diff --git a/camera/camera-core/src/main/java/androidx/camera/core/Preview.java b/camera/camera-core/src/main/java/androidx/camera/core/Preview.java
index 77899224f33..2163ecbeb19 100644
--- a/camera/camera-core/src/main/java/androidx/camera/core/Preview.java
+++ b/camera/camera-core/src/main/java/androidx/camera/core/Preview.java
@@ -38,7 +38,6 @@ import static androidx.camera.core.impl.PreviewConfig.OPTION_TARGET_ASPECT_RATIO
 import static androidx.camera.core.impl.PreviewConfig.OPTION_TARGET_CLASS;
 import static androidx.camera.core.impl.PreviewConfig.OPTION_TARGET_NAME;
 import static androidx.camera.core.impl.PreviewConfig.OPTION_TARGET_ROTATION;
-import static androidx.camera.core.impl.PreviewConfig.OPTION_USE_CASE_EVENT_CALLBACK;
 import static androidx.camera.core.impl.UseCaseConfig.OPTION_CAPTURE_TYPE;
 import static androidx.camera.core.impl.UseCaseConfig.OPTION_HIGH_RESOLUTION_DISABLED;
 import static androidx.camera.core.impl.UseCaseConfig.OPTION_PREVIEW_STABILIZATION_MODE;
@@ -1373,15 +1372,6 @@ public final class Preview extends UseCase {
         }
 
         @RestrictTo(Scope.LIBRARY_GROUP)
-        @Override
-        @NonNull
-        public Builder setUseCaseEventCallback(
-                @NonNull UseCase.EventCallback useCaseEventCallback) {
-            getMutableConfig().insertOption(OPTION_USE_CASE_EVENT_CALLBACK, useCaseEventCallback);
-            return this;
-        }
-
-        @RestrictTo(Scope.LIBRARY_GROUP)
         @NonNull
         @Override
         public Builder setZslDisabled(boolean disabled) {
diff --git a/camera/camera-core/src/main/java/androidx/camera/core/UseCase.java b/camera/camera-core/src/main/java/androidx/camera/core/UseCase.java
index 4ee233d7187..eb703aae93c 100644
--- a/camera/camera-core/src/main/java/androidx/camera/core/UseCase.java
+++ b/camera/camera-core/src/main/java/androidx/camera/core/UseCase.java
@@ -782,11 +782,6 @@ public abstract class UseCase {
      * implementation of the associated camera after this function is invoked. Otherwise, a fake
      * no-op {@link CameraControlInternal} implementation is returned by
      * {@link #getCameraControl()} function.
-     *
-     * <p>An {@link EventCallback} can be registered to receive
-     * {@link EventCallback#onBind(CameraInfo)} event which is invoked right after this function
-     * is executed.
-     *
      */
     @SuppressLint("WrongConstant")
     @RestrictTo(Scope.LIBRARY_GROUP)
@@ -802,11 +797,6 @@ public abstract class UseCase {
         mCameraConfig = cameraConfig;
         mCurrentConfig = mergeConfigs(camera.getCameraInfoInternal(), mExtendedConfig,
                 mCameraConfig);
-
-        EventCallback eventCallback = mCurrentConfig.getUseCaseEventCallback(null);
-        if (eventCallback != null) {
-            eventCallback.onBind(camera.getCameraInfoInternal());
-        }
         onBind();
     }
 
@@ -838,21 +828,12 @@ public abstract class UseCase {
      * <p>After this function is invoked, calling {@link #getCameraControl()} returns a fake no-op
      * {@link CameraControlInternal} implementation.
      *
-     * <p>An {@link EventCallback} can be registered to receive {@link EventCallback#onUnbind()}
-     * event which is invoked right after this function is executed.
-     *
      */
     @RestrictTo(Scope.LIBRARY)
     public final void unbindFromCamera(@NonNull CameraInternal camera) {
         // Do any cleanup required by the UseCase implementation
         onUnbind();
 
-        // Cleanup required for any type of UseCase
-        EventCallback eventCallback = mCurrentConfig.getUseCaseEventCallback(null);
-        if (eventCallback != null) {
-            eventCallback.onUnbind();
-        }
-
         synchronized (mCameraLock) {
             checkArgument(camera == mCamera);
             removeStateChangeCallback(mCamera);
@@ -1110,25 +1091,4 @@ public abstract class UseCase {
          */
         void onUseCaseReset(@NonNull UseCase useCase);
     }
-
-    /**
-     * Callback for when a {@link UseCase} transitions between bound/unbound states.
-     *
-     */
-    @RestrictTo(Scope.LIBRARY_GROUP)
-    public interface EventCallback {
-
-        /**
-         * Called when use case is binding to a camera.
-         *
-         * @param cameraInfo that current used.
-         */
-        void onBind(@NonNull CameraInfo cameraInfo);
-
-        /**
-         * Called when use case is unbinding from the camera to clear additional resources used
-         * for the UseCase.
-         */
-        void onUnbind();
-    }
 }
diff --git a/camera/camera-core/src/main/java/androidx/camera/core/impl/UseCaseConfig.java b/camera/camera-core/src/main/java/androidx/camera/core/impl/UseCaseConfig.java
index f986d1a717f..5ab76220b78 100644
--- a/camera/camera-core/src/main/java/androidx/camera/core/impl/UseCaseConfig.java
+++ b/camera/camera-core/src/main/java/androidx/camera/core/impl/UseCaseConfig.java
@@ -25,7 +25,6 @@ import androidx.camera.core.ExtendableBuilder;
 import androidx.camera.core.UseCase;
 import androidx.camera.core.impl.stabilization.StabilizationMode;
 import androidx.camera.core.internal.TargetConfig;
-import androidx.camera.core.internal.UseCaseEventConfig;
 
 /**
  * Configuration containing options for use cases.
@@ -33,8 +32,7 @@ import androidx.camera.core.internal.UseCaseEventConfig;
  * @param <T> The use case being configured.
  */
 @RequiresApi(21) // TODO(b/200306659): Remove and replace with annotation on package-info.java
-public interface UseCaseConfig<T extends UseCase> extends TargetConfig<T>, UseCaseEventConfig,
-        ImageInputConfig {
+public interface UseCaseConfig<T extends UseCase> extends TargetConfig<T>, ImageInputConfig {
     // Option Declarations:
     // *********************************************************************************************
 
@@ -341,7 +339,7 @@ public interface UseCaseConfig<T extends UseCase> extends TargetConfig<T>, UseCa
      * @param <B> The top level builder type for which this builder is composed with.
      */
     interface Builder<T extends UseCase, C extends UseCaseConfig<T>, B> extends
-            TargetConfig.Builder<T, B>, ExtendableBuilder<T>, UseCaseEventConfig.Builder<B> {
+            TargetConfig.Builder<T, B>, ExtendableBuilder<T> {
 
         /**
          * Sets the default session configuration for this use case.
diff --git a/camera/camera-core/src/main/java/androidx/camera/core/internal/UseCaseEventConfig.java b/camera/camera-core/src/main/java/androidx/camera/core/internal/UseCaseEventConfig.java
deleted file mode 100644
index 3e8a1e5448b..00000000000
--- a/camera/camera-core/src/main/java/androidx/camera/core/internal/UseCaseEventConfig.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- * Copyright 2019 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package androidx.camera.core.internal;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.annotation.RequiresApi;
-import androidx.camera.core.UseCase;
-import androidx.camera.core.impl.Config;
-import androidx.camera.core.impl.ReadableConfig;
-
-/**
- * Configuration containing options pertaining to EventCallback object.
- */
-@RequiresApi(21) // TODO(b/200306659): Remove and replace with annotation on package-info.java
-public interface UseCaseEventConfig extends ReadableConfig {
-
-    /**
-     * Option: camerax.core.useCaseEventCallback
-     */
-    Config.Option<UseCase.EventCallback> OPTION_USE_CASE_EVENT_CALLBACK =
-            Config.Option.create("camerax.core.useCaseEventCallback", UseCase.EventCallback.class);
-
-    /**
-     * Returns the EventCallback.
-     *
-     * @param valueIfMissing The value to return if this configuration option has not been set.
-     * @return The stored value or <code>valueIfMissing</code> if the value does not exist in this
-     * configuration.
-     */
-    @Nullable
-    default UseCase.EventCallback getUseCaseEventCallback(
-            @Nullable UseCase.EventCallback valueIfMissing) {
-        return retrieveOption(OPTION_USE_CASE_EVENT_CALLBACK, valueIfMissing);
-    }
-
-    /**
-     * Returns the EventCallback.
-     *
-     * @return The stored value, if it exists in this configuration.
-     */
-    @NonNull
-    default UseCase.EventCallback getUseCaseEventCallback() {
-        return retrieveOption(OPTION_USE_CASE_EVENT_CALLBACK);
-    }
-
-    // Option Declarations:
-    // *********************************************************************************************
-
-    /**
-     * Builder for a {@link UseCaseEventConfig}.
-     *
-     * @param <B> The top level builder type for which this builder is composed with.
-     */
-    interface Builder<B> {
-
-        /**
-         * Sets the EventCallback.
-         *
-         * @param eventCallback The EventCallback.
-         * @return the current Builder.
-         */
-        @NonNull
-        B setUseCaseEventCallback(@NonNull UseCase.EventCallback eventCallback);
-    }
-}
diff --git a/camera/camera-core/src/main/java/androidx/camera/core/streamsharing/StreamSharingBuilder.java b/camera/camera-core/src/main/java/androidx/camera/core/streamsharing/StreamSharingBuilder.java
index 699f5d9c498..8891b196afa 100644
--- a/camera/camera-core/src/main/java/androidx/camera/core/streamsharing/StreamSharingBuilder.java
+++ b/camera/camera-core/src/main/java/androidx/camera/core/streamsharing/StreamSharingBuilder.java
@@ -153,13 +153,6 @@ class StreamSharingBuilder implements
         return this;
     }
 
-    @NonNull
-    @Override
-    public StreamSharingBuilder setUseCaseEventCallback(
-            @NonNull UseCase.EventCallback eventCallback) {
-        throw new UnsupportedOperationException(UNSUPPORTED_MESSAGE);
-    }
-
     @RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
     @NonNull
     @Override
diff --git a/camera/camera-core/src/test/java/androidx/camera/core/internal/CameraUseCaseAdapterTest.kt b/camera/camera-core/src/test/java/androidx/camera/core/internal/CameraUseCaseAdapterTest.kt
index 1c98611ae74..dbc121e93b8 100644
--- a/camera/camera-core/src/test/java/androidx/camera/core/internal/CameraUseCaseAdapterTest.kt
+++ b/camera/camera-core/src/test/java/androidx/camera/core/internal/CameraUseCaseAdapterTest.kt
@@ -87,7 +87,6 @@ import org.junit.runner.RunWith
 import org.mockito.ArgumentMatchers.any
 import org.mockito.ArgumentMatchers.eq
 import org.mockito.ArgumentMatchers.isNull
-import org.mockito.Mockito.mock
 import org.mockito.Mockito.spy
 import org.mockito.Mockito.verify
 import org.robolectric.RobolectricTestRunner
@@ -642,23 +641,6 @@ class CameraUseCaseAdapterTest {
     }
 
     @Test
-    fun eventCallbackOnBind() {
-        val callback = mock(UseCase.EventCallback::class.java)
-        val fakeUseCase = FakeUseCaseConfig.Builder().setUseCaseEventCallback(callback).build()
-        adapter.addUseCases(listOf(fakeUseCase))
-        verify(callback).onBind(fakeCamera.cameraInfoInternal)
-    }
-
-    @Test
-    fun eventCallbackOnUnbind() {
-        val callback = mock(UseCase.EventCallback::class.java)
-        val fakeUseCase = FakeUseCaseConfig.Builder().setUseCaseEventCallback(callback).build()
-        adapter.addUseCases(listOf(fakeUseCase))
-        adapter.removeUseCases(listOf(fakeUseCase))
-        verify(callback).onUnbind()
-    }
-
-    @Test
     fun addExistingUseCase_viewPortUpdated() {
         val aspectRatio1 = Rational(1, 1)
         val aspectRatio2 = Rational(2, 1)
diff --git a/camera/camera-testing/src/main/java/androidx/camera/testing/impl/fakes/FakeUseCaseConfig.java b/camera/camera-testing/src/main/java/androidx/camera/testing/impl/fakes/FakeUseCaseConfig.java
index ae64c8c1721..485a29b3ccf 100644
--- a/camera/camera-testing/src/main/java/androidx/camera/testing/impl/fakes/FakeUseCaseConfig.java
+++ b/camera/camera-testing/src/main/java/androidx/camera/testing/impl/fakes/FakeUseCaseConfig.java
@@ -25,7 +25,6 @@ import androidx.annotation.NonNull;
 import androidx.annotation.RequiresApi;
 import androidx.camera.core.DynamicRange;
 import androidx.camera.core.MirrorMode;
-import androidx.camera.core.UseCase;
 import androidx.camera.core.impl.CaptureConfig;
 import androidx.camera.core.impl.Config;
 import androidx.camera.core.impl.ImageInputConfig;
@@ -189,13 +188,6 @@ public class FakeUseCaseConfig implements UseCaseConfig<FakeUseCase>, ImageOutpu
             return this;
         }
 
-        @Override
-        @NonNull
-        public Builder setUseCaseEventCallback(@NonNull UseCase.EventCallback eventCallback) {
-            getMutableConfig().insertOption(OPTION_USE_CASE_EVENT_CALLBACK, eventCallback);
-            return this;
-        }
-
         @NonNull
         @Override
         public Builder setTargetAspectRatio(int aspectRatio) {
diff --git a/camera/camera-video/src/main/java/androidx/camera/video/VideoCapture.java b/camera/camera-video/src/main/java/androidx/camera/video/VideoCapture.java
index 56bba4759c1..cb0ac569344 100644
--- a/camera/camera-video/src/main/java/androidx/camera/video/VideoCapture.java
+++ b/camera/camera-video/src/main/java/androidx/camera/video/VideoCapture.java
@@ -42,7 +42,6 @@ import static androidx.camera.core.impl.utils.TransformUtils.within360;
 import static androidx.camera.core.internal.TargetConfig.OPTION_TARGET_CLASS;
 import static androidx.camera.core.internal.TargetConfig.OPTION_TARGET_NAME;
 import static androidx.camera.core.internal.ThreadConfig.OPTION_BACKGROUND_EXECUTOR;
-import static androidx.camera.core.internal.UseCaseEventConfig.OPTION_USE_CASE_EVENT_CALLBACK;
 import static androidx.camera.core.internal.utils.SizeUtil.getArea;
 import static androidx.camera.video.QualitySelector.getQualityToResolutionMap;
 import static androidx.camera.video.StreamInfo.STREAM_ID_ERROR;
@@ -1896,15 +1895,6 @@ public final class VideoCapture<T extends VideoOutput> extends UseCase {
         }
 
         @RestrictTo(Scope.LIBRARY_GROUP)
-        @Override
-        @NonNull
-        public Builder<T> setUseCaseEventCallback(
-                @NonNull EventCallback useCaseEventCallback) {
-            getMutableConfig().insertOption(OPTION_USE_CASE_EVENT_CALLBACK, useCaseEventCallback);
-            return this;
-        }
-
-        @RestrictTo(Scope.LIBRARY_GROUP)
         @NonNull
         @Override
         public Builder<T> setZslDisabled(boolean disabled) {