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

Commit cebe6d2d authored by Emilian Peev's avatar Emilian Peev Committed by android-build-merger
Browse files

Merge "Merge "Camera: Fix some documentation typos" into qt-dev am: ee0d8180... 

Merge "Merge "Camera: Fix some documentation typos" into qt-dev am: ee0d8180 am: 8698821c" into qt-r1-dev-plus-aosp
am: ea38cd80

Change-Id: I95317816a5775a3821b73541370e62a4a2b6cb6b
parents 2e9b5c1b ea38cd80

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

+2 −2
Original line number Diff line number Diff line
@@ -98,7 +98,7 @@ public final class CameraManager { 
     * identifiers, while removable cameras have a unique identifier for each

     * individual device, even if they are the same model.</p>

     *

     * <p>This list doesn't contain physical cameras that can only used as part of a logical

     * <p>This list doesn't contain physical cameras that can only be used as part of a logical

     * multi-camera device.</p>

     *

     * @return The list of currently connected camera devices.
@@ -263,7 +263,7 @@ public final class CameraManager { 
     * immutable for a given camera.</p>

     *

     * <p>From API level 29, this function can also be used to query the capabilities of physical

     * cameras that can only be used as part of logical multi-camera. These cameras cannot not be

     * cameras that can only be used as part of logical multi-camera. These cameras cannot be

     * opened directly via {@link #openCamera}</p>

     *

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