diff options
| author | Shuzhen Wang <shuzhenwang@google.com> | 2018-08-16 18:28:39 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-08-16 18:28:39 -0700 |
| commit | f48e7e080c6de2b64dff91ec5f7337511f506eaa (patch) | |
| tree | 784be7d57f08a4f9723b23cf77314aa46b51be50 /core/java | |
| parent | 62d6a21c29768eb5798aa0663338bc72acbe85dc (diff) | |
| parent | 4d618965f57948eab414f94e5578ebe3483c1d90 (diff) | |
Merge "Camera: Documentation update to remove physicalIds" into pi-dev am: 121d4eee01
am: 4d618965f5
Change-Id: I1110b463686aa2c8c46b0b9b2db48e41399168bf
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/hardware/camera2/CameraMetadata.java | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/core/java/android/hardware/camera2/CameraMetadata.java b/core/java/android/hardware/camera2/CameraMetadata.java index 1275a852ee2b..caa99d5cb2a8 100644 --- a/core/java/android/hardware/camera2/CameraMetadata.java +++ b/core/java/android/hardware/camera2/CameraMetadata.java @@ -819,11 +819,11 @@ public abstract class CameraMetadata<TKey> { * camera in the list of supported camera devices.</p> * <p>This capability requires the camera device to support the following:</p> * <ul> - * <li>This camera device must list the following static metadata entries in {@link android.hardware.camera2.CameraCharacteristics }:<ul> - * <li>android.logicalMultiCamera.physicalIds</li> - * <li>{@link CameraCharacteristics#LOGICAL_MULTI_CAMERA_SENSOR_SYNC_TYPE android.logicalMultiCamera.sensorSyncType}</li> - * </ul> - * </li> + * <li>The IDs of underlying physical cameras are returned via + * {@link android.hardware.camera2.CameraCharacteristics#getPhysicalCameraIds }.</li> + * <li>This camera device must list static metadata + * {@link CameraCharacteristics#LOGICAL_MULTI_CAMERA_SENSOR_SYNC_TYPE android.logicalMultiCamera.sensorSyncType} in + * {@link android.hardware.camera2.CameraCharacteristics }.</li> * <li>The underlying physical cameras' static metadata must list the following entries, * so that the application can correlate pixels from the physical streams:<ul> * <li>{@link CameraCharacteristics#LENS_POSE_REFERENCE android.lens.poseReference}</li> |