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

Commit 3d003089 authored by Elliott Hughes's avatar Elliott Hughes Committed by Android (Google) Code Review
Browse files

Merge "resolve merge conflicts of 65418ca2 to sc-dev" into sc-dev

parents 01525dd3 7b5bb801

camera/ndk/include/camera/NdkCameraCaptureSession.h

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


__BEGIN_DECLS



#if __ANDROID_API__ >= 24



/**

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

 *
@@ -593,10 +591,6 @@ 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;



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

camera_status_t ACameraCaptureSession_updateSharedOutput(ACameraCaptureSession* session,

        ACaptureSessionOutput* output) __INTRODUCED_IN(28);

#endif /* __ANDROID_API__ >= 28 */



#if __ANDROID_API__ >= 29

/**

 * The definition of final capture result callback with logical multi-camera support.

 *
@@ -788,8 +780,6 @@ camera_status_t ACameraCaptureSession_logicalCamera_setRepeatingRequest( 
        int numRequests, ACaptureRequest** requests,

        /*optional*/int* captureSequenceId) __INTRODUCED_IN(29);



#endif /* __ANDROID_API__ >= 29 */



__END_DECLS



#endif /* _NDK_CAMERA_CAPTURE_SESSION_H */

camera/ndk/include/camera/NdkCameraDevice.h

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


__BEGIN_DECLS



#if __ANDROID_API__ >= 24



/**

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

 *
@@ -687,10 +685,6 @@ 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.

 *
@@ -782,10 +776,6 @@ camera_status_t ACameraDevice_createCaptureSessionWithSessionParameters( 
        const ACameraCaptureSession_stateCallbacks* callbacks,

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



#endif /* __ANDROID_API__ >= 28 */



#if __ANDROID_API__ >= 29



/**

 * Create a ACaptureSessionOutput object used for streaming from a physical

 * camera as part of a logical camera device.
@@ -890,8 +880,6 @@ camera_status_t ACameraDevice_isSessionConfigurationSupported( 
        const ACameraDevice* device,

        const ACaptureSessionOutputContainer* sessionOutputContainer) __INTRODUCED_IN(29);



#endif /* __ANDROID_API__ >= 29 */



__END_DECLS



#endif /* _NDK_CAMERA_DEVICE_H */

camera/ndk/include/camera/NdkCameraError.h

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


__BEGIN_DECLS



#if __ANDROID_API__ >= 24



typedef enum {

    ACAMERA_OK = 0,
@@ -138,8 +136,6 @@ typedef enum { 
    ACAMERA_ERROR_UNSUPPORTED_OPERATION = ACAMERA_ERROR_BASE - 14,

} camera_status_t;



#endif /* __ANDROID_API__ >= 24 */



__END_DECLS



#endif /* _NDK_CAMERA_ERROR_H */

camera/ndk/include/camera/NdkCameraManager.h

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


__BEGIN_DECLS



#if __ANDROID_API__ >= 24



/**

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

 *
@@ -293,10 +291,6 @@ camera_status_t ACameraManager_openCamera( 
        ACameraDevice_StateCallbacks* callback,

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



#endif /* __ANDROID_API__ >= 24 */



#if __ANDROID_API__ >= 29



/**

 * Definition of camera access permission change callback.

 *
@@ -419,8 +413,6 @@ camera_status_t ACameraManager_getTagFromName(ACameraManager *manager, const cha 
        __INTRODUCED_IN(29);

#endif



#endif /* __ANDROID_API__ >= 29 */



__END_DECLS



#endif /* _NDK_CAMERA_MANAGER_H */

camera/ndk/include/camera/NdkCameraMetadata.h

+0 −12
Original line number Diff line number Diff line
@@ -41,9 +41,7 @@ 
#include <sys/cdefs.h>



#ifndef __ANDROID_VNDK__

#if __ANDROID_API__ >= 30

#include "jni.h"

#endif  /* __ANDROID_API__ >= 30 */

#endif  /* __ANDROID_VNDK__ */



#include "NdkCameraError.h"
@@ -51,8 +49,6 @@ 


__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
@@ -238,10 +234,6 @@ ACameraMetadata* ACameraMetadata_copy(const ACameraMetadata* src) __INTRODUCED_I 
 */

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



#endif /* __ANDROID_API__ >= 24 */



#if __ANDROID_API__ >= 29



/**

 * Helper function to check if a camera is logical multi-camera.

 *
@@ -260,10 +252,7 @@ bool ACameraMetadata_isLogicalMultiCamera(const ACameraMetadata* staticMetadata, 
        /*out*/size_t* numPhysicalCameras, /*out*/const char* const** physicalCameraIds)

        __INTRODUCED_IN(29);



#endif /* __ANDROID_API__ >= 29 */



#ifndef __ANDROID_VNDK__

#if __ANDROID_API__ >= 30



/**

 * Return a {@link ACameraMetadata} that references the same data as
@@ -290,7 +279,6 @@ bool ACameraMetadata_isLogicalMultiCamera(const ACameraMetadata* staticMetadata, 
ACameraMetadata* ACameraMetadata_fromCameraMetadata(JNIEnv* env, jobject cameraMetadata)

        __INTRODUCED_IN(30);



#endif /* __ANDROID_API__ >= 30 */

#endif  /* __ANDROID_VNDK__ */



__END_DECLS