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

Commit ff717cac 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: 79b9d483

Change-Id: Ie33e09892b21aee2a1310ded541d04f8f4d2480c
parents cdca8b42 79b9d483

camera/ndk/include/camera/NdkCameraCaptureSession.h

+7 −0
Original line number Diff line number Diff line
@@ -45,6 +45,8 @@ 


__BEGIN_DECLS



#if __ANDROID_API__ >= 24



/**

 * ACameraCaptureSession is an opaque type that manages frame captures of a camera device.

 *
@@ -591,6 +593,10 @@ camera_status_t ACameraCaptureSession_stopRepeating(ACameraCaptureSession* sessi 
camera_status_t ACameraCaptureSession_abortCaptures(ACameraCaptureSession* session)

        __INTRODUCED_IN(24);



#endif /* __ANDROID_API__ >= 24 */



#if __ANDROID_API__ >= 28



typedef struct ACaptureSessionOutput ACaptureSessionOutput;



/**
@@ -635,6 +641,7 @@ typedef struct ACaptureSessionOutput ACaptureSessionOutput; 
 */

camera_status_t ACameraCaptureSession_updateSharedOutput(ACameraCaptureSession* session,

        ACaptureSessionOutput* output) __INTRODUCED_IN(28);

#endif /* __ANDROID_API__ >= 28 */



__END_DECLS

camera/ndk/include/camera/NdkCameraDevice.h

+8 −0
Original line number Diff line number Diff line
@@ -44,6 +44,8 @@ 


__BEGIN_DECLS



#if __ANDROID_API__ >= 24



/**

 * ACameraDevice is opaque type that provides access to a camera device.

 *
@@ -666,6 +668,10 @@ camera_status_t ACameraDevice_createCaptureSession( 
        const ACameraCaptureSession_stateCallbacks* callbacks,

        /*out*/ACameraCaptureSession** session) __INTRODUCED_IN(24);



#endif /* __ANDROID_API__ >= 24 */



#if __ANDROID_API__ >= 28



/**

 * Create a shared ACaptureSessionOutput object.

 *
@@ -757,6 +763,8 @@ camera_status_t ACameraDevice_createCaptureSessionWithSessionParameters( 
        const ACameraCaptureSession_stateCallbacks* callbacks,

        /*out*/ACameraCaptureSession** session) __INTRODUCED_IN(28);



#endif /* __ANDROID_API__ >= 28 */



__END_DECLS



#endif /* _NDK_CAMERA_DEVICE_H */

camera/ndk/include/camera/NdkCameraError.h

+4 −0
Original line number Diff line number Diff line
@@ -40,6 +40,8 @@ 


__BEGIN_DECLS



#if __ANDROID_API__ >= 24



typedef enum {

    ACAMERA_OK = 0,
@@ -130,6 +132,8 @@ typedef enum { 
    ACAMERA_ERROR_PERMISSION_DENIED     = ACAMERA_ERROR_BASE - 13,

} camera_status_t;



#endif /* __ANDROID_API__ >= 24 */



__END_DECLS



#endif /* _NDK_CAMERA_ERROR_H */

camera/ndk/include/camera/NdkCameraManager.h

+5 −1
Original line number Diff line number Diff line
@@ -44,6 +44,8 @@ 


__BEGIN_DECLS



#if __ANDROID_API__ >= 24



/**

 * ACameraManager is opaque type that provides access to camera service.

 *
@@ -119,7 +121,7 @@ void ACameraManager_deleteCameraIdList(ACameraIdList* cameraIdList) __INTRODUCED 
 *                 this callback returns.

 */

typedef void (*ACameraManager_AvailabilityCallback)(void* context,

        const char* cameraId) __INTRODUCED_IN(24);

        const char* cameraId);



/**

 * A listener for camera devices becoming available or unavailable to open.
@@ -274,6 +276,8 @@ camera_status_t ACameraManager_openCamera( 
        ACameraDevice_StateCallbacks* callback,

        /*out*/ACameraDevice** device) __INTRODUCED_IN(24);



#endif /* __ANDROID_API__ >= 24 */



__END_DECLS



#endif /* _NDK_CAMERA_MANAGER_H */

camera/ndk/include/camera/NdkCameraMetadata.h

+4 −0
Original line number Diff line number Diff line
@@ -44,6 +44,8 @@ 


__BEGIN_DECLS



#if __ANDROID_API__ >= 24



/**

 * ACameraMetadata is opaque type that provides access to read-only camera metadata like camera

 * characteristics (via {@link ACameraManager_getCameraCharacteristics}) or capture results (via
@@ -229,6 +231,8 @@ ACameraMetadata* ACameraMetadata_copy(const ACameraMetadata* src) __INTRODUCED_I 
 */

void ACameraMetadata_free(ACameraMetadata* metadata) __INTRODUCED_IN(24);



#endif /* __ANDROID_API__ >= 24 */



__END_DECLS



#endif /* _NDK_CAMERA_METADATA_H */