Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f48e7e08 authored by Shuzhen Wang's avatar Shuzhen Wang Committed by android-build-merger
Browse files

Merge "Camera: Documentation update to remove physicalIds" into pi-dev am: 121d4eee 

am: 4d618965

Change-Id: I1110b463686aa2c8c46b0b9b2db48e41399168bf
parents 62d6a21c 4d618965

core/java/android/hardware/camera2/CameraMetadata.java

+5 −5
Original line number Original line Diff line number Diff line
@@ -819,11 +819,11 @@ public abstract class CameraMetadata<TKey> { 
     * camera in the list of supported camera devices.</p>

     * camera in the list of supported camera devices.</p>

     * <p>This capability requires the camera device to support the following:</p>

     * <p>This capability requires the camera device to support the following:</p>

     * <ul>

     * <ul>

     * <li>This camera device must list the following static metadata entries in {@link android.hardware.camera2.CameraCharacteristics }:<ul>

     * <li>The IDs of underlying physical cameras are returned via

     * <li>android.logicalMultiCamera.physicalIds</li>

     *   {@link android.hardware.camera2.CameraCharacteristics#getPhysicalCameraIds }.</li>

     * <li>{@link CameraCharacteristics#LOGICAL_MULTI_CAMERA_SENSOR_SYNC_TYPE android.logicalMultiCamera.sensorSyncType}</li>

     * <li>This camera device must list static metadata

     * </ul>

     *   {@link CameraCharacteristics#LOGICAL_MULTI_CAMERA_SENSOR_SYNC_TYPE android.logicalMultiCamera.sensorSyncType} in

     * </li>

     *   {@link android.hardware.camera2.CameraCharacteristics }.</li>

     * <li>The underlying physical cameras' static metadata must list the following entries,

     * <li>The underlying physical cameras' static metadata must list the following entries,

     *   so that the application can correlate pixels from the physical streams:<ul>

     *   so that the application can correlate pixels from the physical streams:<ul>

     * <li>{@link CameraCharacteristics#LENS_POSE_REFERENCE android.lens.poseReference}</li>

     * <li>{@link CameraCharacteristics#LENS_POSE_REFERENCE android.lens.poseReference}</li>