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

Commit b3bd6451 authored by Austin Borger's avatar Austin Borger Committed by Automerger Merge Worker
Browse files

Merge "Camera2: Add documentation for the TestApi getCameraCharacteristics."... 

Merge "Camera2: Add documentation for the TestApi getCameraCharacteristics." into udc-dev am: c51c3325

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22260211



Change-Id: I34f63ddecfeb695321d8894ea13679cc3ff44a46
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 531321ad c51c3325

core/java/android/hardware/camera2/CameraManager.java

+15 −0
Original line number Diff line number Diff line
@@ -609,6 +609,21 @@ public final class CameraManager { 
    }



    /**

     * <p>Query the capabilities of a camera device. These capabilities are

     * immutable for a given camera.</p>

     *

     * <p>The value of {@link CameraCharacteristics.SENSOR_ORIENTATION} will change for landscape

     * cameras depending on whether overrideToPortrait is enabled. If enabled, these cameras will

     * appear to be portrait orientation instead, provided that the override is supported by the

     * camera device. Only devices that can be opened by {@link #openCamera} will report a changed

     * {@link CameraCharacteristics.SENSOR_ORIENTATION}.</p>

     *

     * @param cameraId The id of the camera device to query. This could be either a standalone

     * camera ID which can be directly opened by {@link #openCamera}, or a physical camera ID that

     * can only used as part of a logical multi-camera.

     * @param overrideToPortrait Whether to apply the landscape to portrait override.

     * @return The properties of the given camera

     *

     * @hide

     */

    @TestApi