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

Commit be9b8bc0 authored by Yin-Chia Yeh's avatar Yin-Chia Yeh
Browse files

Camera NDK: fix typedef name

Bug: https://github.com/android-ndk/ndk/issues/559
Change-Id: I3e8c42c59fbc7bdd83a9eb3b6248823e17155837
parent 6e2353b8
Loading
Loading
Loading
Loading
+5 −5
Original line number Diff line number Diff line
@@ -90,18 +90,18 @@ enum {
};

/**
 * Camera device state callbacks to be used in {@link ACameraDevice_stateCallbacks}.
 * Camera device state callbacks to be used in {@link ACameraDevice_StateCallbacks}.
 *
 * @param context The optional context in {@link ACameraDevice_stateCallbacks} will be
 * @param context The optional context in {@link ACameraDevice_StateCallbacks} will be
 *                passed to this callback.
 * @param device The {@link ACameraDevice} that is being disconnected.
 */
typedef void (*ACameraDevice_StateCallback)(void* context, ACameraDevice* device);

/**
 * Camera device error state callbacks to be used in {@link ACameraDevice_stateCallbacks}.
 * Camera device error state callbacks to be used in {@link ACameraDevice_StateCallbacks}.
 *
 * @param context The optional context in {@link ACameraDevice_stateCallbacks} will be
 * @param context The optional context in {@link ACameraDevice_StateCallbacks} will be
 *                passed to this callback.
 * @param device The {@link ACameraDevice} that is being disconnected.
 * @param error The error code describes the cause of this error callback. See the folowing
@@ -150,7 +150,7 @@ typedef struct ACameraDevice_StateCallbacks {
     *
     */
    ACameraDevice_ErrorStateCallback  onError;
} ACameraDevice_stateCallbacks;
} ACameraDevice_StateCallbacks;

/**
 * Close the connection and free this ACameraDevice synchronously. Access to the ACameraDevice
+3 −3
Original line number Diff line number Diff line
@@ -232,18 +232,18 @@ camera_status_t ACameraManager_getCameraCharacteristics(
 * priority when accessing the camera, and this method will succeed even if the camera device is
 * in use by another camera API client. Any lower-priority application that loses control of the
 * camera in this way will receive an
 * {@link ACameraDevice_stateCallbacks#onDisconnected} callback.</p>
 * {@link ACameraDevice_StateCallbacks#onDisconnected} callback.</p>
 *
 * <p>Once the camera is successfully opened,the ACameraDevice can then be set up
 * for operation by calling {@link ACameraDevice_createCaptureSession} and
 * {@link ACameraDevice_createCaptureRequest}.</p>
 *
 * <p>If the camera becomes disconnected after this function call returns,
 * {@link ACameraDevice_stateCallbacks#onDisconnected} with a
 * {@link ACameraDevice_StateCallbacks#onDisconnected} with a
 * ACameraDevice in the disconnected state will be called.</p>
 *
 * <p>If the camera runs into error after this function call returns,
 * {@link ACameraDevice_stateCallbacks#onError} with a
 * {@link ACameraDevice_StateCallbacks#onError} with a
 * ACameraDevice in the error state will be called.</p>
 *
 * @param manager the {@link ACameraManager} of interest.