diff options
| author | 2022-11-28 18:20:20 +0000 | |
|---|---|---|
| committer | 2022-11-28 18:20:20 +0000 | |
| commit | 282a29b8ba28ccd5c10409809ee3cab8b27b7e6f (patch) | |
| tree | aba96210d44754ccbe8dd7014f2ab68a8c9557db | |
| parent | a8d89abdade50fe7afb5c0d3eeef09a334aa09d4 (diff) | |
| parent | 38ede54c5e80d853a9414f4e3278dadd030d3c75 (diff) | |
Merge "camera2: Fix getConcurrentCameraIds doc formatting"
| -rw-r--r-- | core/java/android/hardware/camera2/CameraManager.java | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/core/java/android/hardware/camera2/CameraManager.java b/core/java/android/hardware/camera2/CameraManager.java index 5718532dd661..2d0520bc47df 100644 --- a/core/java/android/hardware/camera2/CameraManager.java +++ b/core/java/android/hardware/camera2/CameraManager.java @@ -245,11 +245,13 @@ public final class CameraManager { * applications is not guaranteed to be supported, however.</p> * * <p>For concurrent operation, in chronological order : - * - Applications must first close any open cameras that have sessions configured, using - * {@link CameraDevice#close}. - * - All camera devices intended to be operated concurrently, must be opened using - * {@link #openCamera}, before configuring sessions on any of the camera devices.</p> - * + * <ul> + * <li> Applications must first close any open cameras that have sessions configured, using + * {@link CameraDevice#close}. </li> + * <li> All camera devices intended to be operated concurrently, must be opened using + * {@link #openCamera}, before configuring sessions on any of the camera devices.</li> + *</ul> + *</p> * <p>Each device in a combination, is guaranteed to support stream combinations which may be * obtained by querying {@link #getCameraCharacteristics} for the key * {@link android.hardware.camera2.CameraCharacteristics#SCALER_MANDATORY_CONCURRENT_STREAM_COMBINATIONS}.</p> |