diff options
| author | Dave Sparks <davidsparks@android.com> | 2009-07-08 17:26:05 -0700 |
|---|---|---|
| committer | Dave Sparks <davidsparks@android.com> | 2009-07-08 17:26:05 -0700 |
| commit | 9f1234e4600d343710635973f3296da7b39cd9a2 (patch) | |
| tree | e110a73a5cec4dd06a16f666430bc04413680b3f /include/ui/CameraHardwareInterface.h | |
| parent | 9e76a23f59880a4709a300f5af5c6e9a348f6e19 (diff) | |
| parent | 47a97daf3b85e07551751eaf095106c1a911fc99 (diff) | |
| download | frameworks_native-9f1234e4600d343710635973f3296da7b39cd9a2.zip frameworks_native-9f1234e4600d343710635973f3296da7b39cd9a2.tar.gz frameworks_native-9f1234e4600d343710635973f3296da7b39cd9a2.tar.bz2 | |
resolved conflicts for merge of 04c7d0f8 to master
Diffstat (limited to 'include/ui/CameraHardwareInterface.h')
| -rw-r--r-- | include/ui/CameraHardwareInterface.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/ui/CameraHardwareInterface.h b/include/ui/CameraHardwareInterface.h index 2cdcc06..c703f5e 100644 --- a/include/ui/CameraHardwareInterface.h +++ b/include/ui/CameraHardwareInterface.h @@ -28,7 +28,7 @@ namespace android { typedef void (*preview_callback)(const sp<IMemory>& mem, void* user); /** Callback for startRecord() */ -typedef void (*recording_callback)(const sp<IMemory>& mem, void* user); +typedef void (*recording_callback)(nsecs_t timestamp, const sp<IMemory>& mem, void* user); /** Callback for takePicture() */ typedef void (*shutter_callback)(void* user); |