summaryrefslogtreecommitdiff
path: root/core/java
diff options
context:
space:
mode:
authorJayant Chowdhary <jchowdhary@google.com>2020-02-25 15:31:44 -0800
committerJayant Chowdhary <jchowdhary@google.com>2020-02-26 22:44:42 +0000
commitd7cc17c1642ed39ed5444b221770186e8cc86901 (patch)
treee85df286dc0f03d15fea0c6bf7d1a166c9a25185 /core/java
parent6b0bccc9c2c6b3e3036e0141ada9f496e21ceba8 (diff)
camera2: Add documentation for getConcurrentStreamingCameraIds specifying multi-process use.
Add documentation specifying that camera devices advertised by getConcurrentStreamingCameraIds() refer to those devices which can be configured concurrently by the same client application. Bug: 150225538 Test: m offline-sdk-docs Change-Id: I4997f10ca73de45fd58d22261c7456402d761a57 Signed-off-by: Jayant Chowdhary <jchowdhary@google.com>
Diffstat (limited to 'core/java')
-rw-r--r--core/java/android/hardware/camera2/CameraManager.java12
1 files changed, 10 insertions, 2 deletions
diff --git a/core/java/android/hardware/camera2/CameraManager.java b/core/java/android/hardware/camera2/CameraManager.java
index 743ce7b46792..85ef4a3392a8 100644
--- a/core/java/android/hardware/camera2/CameraManager.java
+++ b/core/java/android/hardware/camera2/CameraManager.java
@@ -131,9 +131,17 @@ public final class CameraManager {
}
/**
- * Return the list of combinations of currently connected camera devices identifiers, which
+ * Return the set of combinations of currently connected camera device identifiers, which
* support configuring camera device sessions concurrently.
*
+ * <p>The devices in these combinations can be concurrently configured by the same
+ * client camera application. Using these camera devices concurrently by two different
+ * applications is not guaranteed to be supported, however.</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>
+ *
* <p>The set of combinations may include camera devices that may be in use by other camera API
* clients.</p>
*
@@ -174,7 +182,7 @@ public final class CameraManager {
* to be used for exploring the entire space of supported concurrent stream combinations. The
* available mandatory concurrent stream combinations may be obtained by querying
* {@link #getCameraCharacteristics} for the key
- * SCALER_MANDATORY_CONCURRENT_STREAM_COMBINATIONS. </p>
+ * {@link android.hardware.camera2.CameraCharacteristics#SCALER_MANDATORY_CONCURRENT_STREAM_COMBINATIONS}. </p>
*
* <p>Note that session parameters will be ignored and calls to
* {@link SessionConfiguration#setSessionParameters} are not required.</p>