Merge changes Ic048107b,I51a07b11,I53a2a20d into androidx-main

* changes:
  Add a quirk that waits for onClosed() during camera close
  Port configAndClose() behavior from CameraX
  Port CaptureSessionStuckQuirk from CameraX

Author: lnishan

camera/camera-camera2-pipe-integration/src/androidTest/java/androidx/camera/camera2/pipe/testing/TestUseCaseCamera.kt

@@ -67,7 +67,11 @@ class TestUseCaseCamera(
     ),
 ) : UseCaseCamera {
     val useCaseCameraGraphConfig =
-        UseCaseCameraConfig(useCases, CameraStateAdapter()).provideUseCaseGraphConfig(
+        UseCaseCameraConfig(
+            useCases,
+            CameraStateAdapter(),
+            CameraGraph.Flags()
+        ).provideUseCaseGraphConfig(
             callbackMap = callbackMap,
             cameraConfig = cameraConfig,
             cameraPipe = cameraPipe,

camera/camera-camera2-pipe-integration/src/main/java/androidx/camera/camera2/pipe/integration/compat/quirk/CameraQuirks.kt

@@ -80,6 +80,9 @@ class CameraQuirks @Inject constructor(
         if (YuvImageOnePixelShiftQuirk.isEnabled()) {
             quirks.add(YuvImageOnePixelShiftQuirk())
         }
+        if (CaptureSessionStuckQuirk.isEnabled()) {
+            quirks.add(CaptureSessionStuckQuirk())
+        }
 
         Quirks(quirks)
     }

camera/camera-camera2-pipe-integration/src/main/java/androidx/camera/camera2/pipe/integration/compat/quirk/CaptureSessionStuckQuirk.kt

@@ -0,0 +1,46 @@
+/*
+ * Copyright 2023 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.camera2.pipe.integration.compat.quirk
+
+import android.annotation.SuppressLint
+import androidx.annotation.RequiresApi
+import androidx.camera.core.impl.Quirk
+
+/**
+ * A quirk to denote the [android.hardware.camera2.CameraCaptureSession] cannot successfully be
+ * configured if the previous CameraCaptureSession doesn't finish its in-flight capture sequence.
+ *
+ * QuirkSummary
+ * - Bug Id:      146773463
+ * - Description: Opening and releasing the capture session quickly and constantly is a problem for
+ *                LEGACY devices. It needs to check that all the existing capture sessions have
+ *                finished the processing of their capture sequences before opening the next capture
+ *                session.
+ * - Device(s):   Devices in LEGACY camera hardware level.
+ */
+@SuppressLint("CameraXQuirksClassDetector")
+@RequiresApi(21) // TODO(b/200306659): Remove and replace with annotation on package-info.java
+class CaptureSessionStuckQuirk : Quirk {
+    companion object {
+        /**
+         * Always return false as CameraPipe handles this automatically. Please refer to
+         * [androidx.camera.camera2.pipe.compat.Camera2Quirks.shouldWaitForRepeatingRequest] for
+         * the conditions under which the quirk will be applied.
+         */
+        fun isEnabled(): Boolean = false
+    }
+}

camera/camera-camera2-pipe-integration/src/main/java/androidx/camera/camera2/pipe/integration/config/CameraConfig.kt

@@ -23,6 +23,7 @@ import android.hardware.camera2.params.StreamConfigurationMap
 import androidx.annotation.Nullable
 import androidx.annotation.RequiresApi
 import androidx.annotation.VisibleForTesting
+import androidx.camera.camera2.pipe.CameraGraph
 import androidx.camera.camera2.pipe.CameraId
 import androidx.camera.camera2.pipe.CameraMetadata
 import androidx.camera.camera2.pipe.CameraPipe
@@ -35,6 +36,8 @@ import androidx.camera.camera2.pipe.integration.compat.Camera2CameraControlCompa
 import androidx.camera.camera2.pipe.integration.compat.CameraCompatModule
 import androidx.camera.camera2.pipe.integration.compat.EvCompCompat
 import androidx.camera.camera2.pipe.integration.compat.ZoomCompat
+import androidx.camera.camera2.pipe.integration.compat.quirk.CameraQuirks
+import androidx.camera.camera2.pipe.integration.compat.quirk.CaptureSessionStuckQuirk
 import androidx.camera.camera2.pipe.integration.impl.CameraPipeCameraProperties
 import androidx.camera.camera2.pipe.integration.impl.CameraProperties
 import androidx.camera.camera2.pipe.integration.impl.ComboRequestListener
@@ -145,6 +148,16 @@ abstract class CameraModule {
         ): StreamConfigurationMap? {
             return cameraMetadata?.get(CameraCharacteristics.SCALER_STREAM_CONFIGURATION_MAP)
         }
+
+        @CameraScope
+        @Provides
+        fun provideCameraGraphFlags(cameraQuirks: CameraQuirks): CameraGraph.Flags {
+            if (cameraQuirks.quirks.contains(CaptureSessionStuckQuirk::class.java)) {
+                Log.debug { "CameraPipe should be enabling CaptureSessionStuckQuirk" }
+            }
+            // TODO(b/276354253): Set quirkWaitForRepeatingRequestOnDisconnect flag for overrides.
+            return CameraGraph.Flags()
+        }
     }
 
     @Binds

camera/camera-camera2-pipe-integration/src/main/java/androidx/camera/camera2/pipe/integration/config/UseCaseCameraConfig.kt

@@ -82,6 +82,7 @@ abstract class UseCaseCameraModule {
 class UseCaseCameraConfig(
     private val useCases: List<UseCase>,
     private val cameraStateAdapter: CameraStateAdapter,
+    private val cameraGraphFlags: CameraGraph.Flags,
 ) {
     @UseCaseCameraScope
     @Provides
@@ -142,6 +143,7 @@ class UseCaseCameraConfig(
                 camera = cameraConfig.cameraId,
                 streams = streamConfigMap.keys.toList(),
                 defaultListeners = listOf(callbackMap, requestListener),
+                flags = cameraGraphFlags,
             )
         )
 

camera/camera-camera2-pipe-integration/src/main/java/androidx/camera/camera2/pipe/integration/impl/UseCaseManager.kt

@@ -20,6 +20,7 @@ import android.media.MediaCodec
 import android.os.Build
 import androidx.annotation.GuardedBy
 import androidx.annotation.RequiresApi
+import androidx.camera.camera2.pipe.CameraGraph
 import androidx.camera.camera2.pipe.core.Log
 import androidx.camera.camera2.pipe.integration.adapter.CameraStateAdapter
 import androidx.camera.camera2.pipe.integration.config.CameraConfig
@@ -71,6 +72,7 @@ class UseCaseManager @Inject constructor(
     private val controls: java.util.Set<UseCaseCameraControl>,
     private val camera2CameraControl: Camera2CameraControl,
     private val cameraStateAdapter: CameraStateAdapter,
+    private val cameraGraphFlags: CameraGraph.Flags,
     cameraProperties: CameraProperties,
     displayInfoManager: DisplayInfoManager,
 ) {
@@ -254,7 +256,9 @@ class UseCaseManager @Inject constructor(
         }
 
         // Create and configure the new camera component.
-        _activeComponent = builder.config(UseCaseCameraConfig(useCases, cameraStateAdapter)).build()
+        _activeComponent =
+            builder.config(UseCaseCameraConfig(useCases, cameraStateAdapter, cameraGraphFlags))
+                .build()
         for (control in allControls) {
             control.useCaseCamera = camera
         }
@@ -277,6 +281,7 @@ class UseCaseManager @Inject constructor(
 
         return !meteringRepeatingEnabled && (onlyVideoCapture || requireMeteringRepeating)
     }
+
     @GuardedBy("lock")
     private fun addRepeatingUseCase() {
         meteringRepeating.setupSession()

camera/camera-camera2-pipe-integration/src/test/java/androidx/camera/camera2/pipe/integration/impl/UseCaseManagerTest.kt

@@ -18,6 +18,7 @@ package androidx.camera.camera2.pipe.integration.impl
 
 import android.os.Build
 import android.util.Size
+import androidx.camera.camera2.pipe.CameraGraph
 import androidx.camera.camera2.pipe.CameraId
 import androidx.camera.camera2.pipe.integration.adapter.CameraStateAdapter
 import androidx.camera.camera2.pipe.integration.adapter.RobolectricCameraPipeTestRunner
@@ -274,6 +275,7 @@ class UseCaseManagerTest {
             ComboRequestListener()
         ),
         cameraStateAdapter = CameraStateAdapter(),
+        cameraGraphFlags = CameraGraph.Flags(),
         displayInfoManager = DisplayInfoManager(ApplicationProvider.getApplicationContext()),
     ).also {
         useCaseManagerList.add(it)
@@ -282,7 +284,7 @@ class UseCaseManagerTest {
     private fun createImageCapture(): ImageCapture =
         ImageCapture.Builder()
             .setCaptureOptionUnpacker { _, _ -> }
-            .setSessionOptionUnpacker() { _, _, _ -> }
+            .setSessionOptionUnpacker { _, _, _ -> }
             .build().also {
                 it.simulateActivation()
                 useCaseList.add(it)
@@ -291,7 +293,7 @@ class UseCaseManagerTest {
     private fun createPreview(): Preview =
         Preview.Builder()
             .setCaptureOptionUnpacker { _, _ -> }
-            .setSessionOptionUnpacker() { _, _, _ -> }
+            .setSessionOptionUnpacker { _, _, _ -> }
             .build().apply {
                 setSurfaceProvider(
                     CameraXExecutors.mainThreadExecutor(),

camera/camera-camera2-pipe-integration/src/test/java/androidx/camera/camera2/pipe/integration/testing/FakeUseCaseCamera.kt

@@ -40,7 +40,8 @@ import kotlinx.coroutines.Job
 import kotlinx.coroutines.withTimeoutOrNull
 
 class FakeUseCaseCameraComponentBuilder : UseCaseCameraComponent.Builder {
-    private var config: UseCaseCameraConfig = UseCaseCameraConfig(emptyList(), CameraStateAdapter())
+    private var config: UseCaseCameraConfig =
+        UseCaseCameraConfig(emptyList(), CameraStateAdapter(), CameraGraph.Flags())
 
     override fun config(config: UseCaseCameraConfig): UseCaseCameraComponent.Builder {
         this.config = config

camera/camera-camera2-pipe/src/main/java/androidx/camera/camera2/pipe/CameraGraph.kt

@@ -135,7 +135,22 @@ interface CameraGraph : AutoCloseable {
     data class Flags(
         val configureBlankSessionOnStop: Boolean = false,
         val abortCapturesOnStop: Boolean = false,
-        val allowMultipleActiveCameras: Boolean = false
+        val allowMultipleActiveCameras: Boolean = false,
+
+        /**
+         * A quirk that waits for the last repeating capture request to start before stopping the
+         * current capture session. Please refer to the bugs linked here, or
+         * [androidx.camera.camera2.pipe.compat.Camera2Quirks.shouldWaitForRepeatingRequest] for
+         * more information.
+         *
+         * This flag provides the overrides for you to override the default behavior (CameraPipe
+         * would turn on/off the quirk automatically based on device information).
+         *
+         * - Bug(s): b/146773463, b/267557892
+         * - Device(s): Camera devices on hardware level LEGACY
+         * - API levels: All
+         */
+        val quirkWaitForRepeatingRequestOnDisconnect: Boolean? = null,
     )
 
     enum class OperatingMode {

camera/camera-camera2-pipe/src/main/java/androidx/camera/camera2/pipe/compat/Camera2CameraController.kt

@@ -57,7 +57,7 @@ constructor(
     private val captureSequenceProcessorFactory: Camera2CaptureSequenceProcessorFactory,
     private val virtualCameraManager: VirtualCameraManager,
     private val cameraSurfaceManager: CameraSurfaceManager,
-    private val timeSource: TimeSource
+    private val timeSource: TimeSource,
 ) : CameraController {
     override val cameraId: CameraId
         get() = config.camera