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

Commit b6d3fbfc authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Camera: Clarify doc for onPhysicalCameraUnavailable" into tm-qpr-dev... 

Merge "Camera: Clarify doc for onPhysicalCameraUnavailable" into tm-qpr-dev am: 0a9fbfe9 am: e766e4e5

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



Change-Id: I6f7e6dc82b2aeb48bfee100d4ee414c390093d1a
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents aab9a0e4 e766e4e5

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

+32 −5
Original line number Original line Diff line number Diff line
@@ -1204,6 +1204,20 @@ public final class CameraManager { 
         * to begin with, {@link #onPhysicalCameraUnavailable} may be invoked after

         * to begin with, {@link #onPhysicalCameraUnavailable} may be invoked after

         * {@link #onCameraAvailable}.</p>

         * {@link #onCameraAvailable}.</p>

         *

         *

         * <p>Limitation: Opening a logical camera disables the {@link #onPhysicalCameraAvailable}

         * and {@link #onPhysicalCameraUnavailable} callbacks for its physical cameras. For example,

         * if app A opens the camera device:</p>

         *

         * <ul>

         *

         * <li>All apps subscribing to ActivityCallback get {@link #onCameraUnavailable}.</li>

         *

         * <li>No app (including app A) subscribing to ActivityCallback gets

         * {@link #onPhysicalCameraAvailable} or {@link #onPhysicalCameraUnavailable}, because

         * the logical camera is unavailable (some app is using it).</li>

         *

         * </ul>

         *

         * <p>The default implementation of this method does nothing.</p>

         * <p>The default implementation of this method does nothing.</p>

         *

         *

         * @param cameraId The unique identifier of the logical multi-camera.

         * @param cameraId The unique identifier of the logical multi-camera.
@@ -1221,11 +1235,24 @@ public final class CameraManager { 
         * A previously-available physical camera has become unavailable for use.

         * A previously-available physical camera has become unavailable for use.

         *

         *

         * <p>By default, all of the physical cameras of a logical multi-camera are

         * <p>By default, all of the physical cameras of a logical multi-camera are

         * available, so {@link #onPhysicalCameraAvailable} is not called for any of the physical

         * unavailable if the logical camera itself is unavailable.

         * cameras of a logical multi-camera, when {@link #onCameraAvailable} for the logical

         * No availability callbacks will be called for any of the physical

         * multi-camera is invoked. If some specific physical cameras are unavailable

         * cameras of its parent logical multi-camera, when {@link #onCameraUnavailable} for

         * to begin with, {@link #onPhysicalCameraUnavailable} may be invoked after

         * the logical multi-camera is invoked.</p>

         * {@link #onCameraAvailable}.</p>

         *

         * <p>Limitation: Opening a logical camera disables the {@link #onPhysicalCameraAvailable}

         * and {@link #onPhysicalCameraUnavailable} callbacks for its physical cameras. For example,

         * if app A opens the camera device:</p>

         *

         * <ul>

         *

         * <li>All apps subscribing to ActivityCallback get {@link #onCameraUnavailable}.</li>

         *

         * <li>No app (including app A) subscribing to ActivityCallback gets

         * {@link #onPhysicalCameraAvailable} or {@link #onPhysicalCameraUnavailable}, because

         * the logical camera is unavailable (some app is using it).</li>

         *

         * </ul>

         *

         *

         * <p>The default implementation of this method does nothing.</p>

         * <p>The default implementation of this method does nothing.</p>

         *

         *