| commit | 485366ec5533cc3120a2c8dce35e38571c16f1cd | [log] [tgz] |
|---|---|---|
| author | Yin-Chia Yeh <yinchiayeh@google.com> | Sat Feb 17 03:55:56 2018 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Sat Feb 17 03:55:56 2018 +0000 |
| tree | 13e816199c9299ef2766ba5c6dfbfaf5b0ef3edf | |
| parent | 4051b1c2df459cba75b3487767a235e9f814ef31 [diff] | |
| parent | 9addb6e1b192f27c419da21cf61fc9440ccd5012 [diff] |
Merge "Camera NDK: fix headers" am: fa87fc3b31 am: 9addb6e1b1 Change-Id: Ie034ecc0fff542fefcba0ce1f4e09c2b15ef87b8
diff --git a/camera/ndk/include/camera/NdkCameraCaptureSession.h b/camera/ndk/include/camera/NdkCameraCaptureSession.h index d96f538..16d227a 100644 --- a/camera/ndk/include/camera/NdkCameraCaptureSession.h +++ b/camera/ndk/include/camera/NdkCameraCaptureSession.h
@@ -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"
diff --git a/camera/ndk/include/camera/NdkCameraDevice.h b/camera/ndk/include/camera/NdkCameraDevice.h index 6c9e85a..2c65529 100644 --- a/camera/ndk/include/camera/NdkCameraDevice.h +++ b/camera/ndk/include/camera/NdkCameraDevice.h
@@ -153,6 +153,11 @@ } 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. *