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

Commit bc05249d authored by Yin-Chia Yeh's avatar Yin-Chia Yeh Committed by android-build-merger
Browse files

Merge "Camera NDK: fix headers" am: fa87fc3b am: 9addb6e1 

am: 485366ec

Change-Id: I716a256a0320dfe65b6138b6335063789836ece3
parents 5df26c9b 485366ec

camera/ndk/include/camera/NdkCameraCaptureSession.h

+1 −0
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ 
 * Do not #include files that aren't part of the NDK.

 */

#include <sys/cdefs.h>

#include <stdbool.h>



#include <android/native_window.h>

#include "NdkCameraError.h"

camera/ndk/include/camera/NdkCameraDevice.h

+5 −0
Original line number Diff line number Diff line
@@ -152,6 +152,11 @@ typedef struct ACameraDevice_StateCallbacks { 
    ACameraDevice_ErrorStateCallback  onError;

} ACameraDevice_StateCallbacks;



/**

 * For backward compatiblity.

 */

typedef ACameraDevice_StateCallbacks ACameraDevice_stateCallbacks;



/**

 * Close the connection and free this ACameraDevice synchronously. Access to the ACameraDevice

 * after calling this method will cause a crash.