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

Commit 66e6f61b authored by Ryan Prichard's avatar Ryan Prichard Committed by android-build-merger
Browse files

Merge changes from topic "b113052379-cp-from-pi-dev-p2" 

am: c9fc995e

Change-Id: Ia83844fa93a02234178042be85cc99eaeaca221f
parents e0641b26 c9fc995e

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

+5 −5
Original line number Diff line number Diff line
@@ -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>