diff options
| author | 2009-07-08 17:26:05 -0700 | |
|---|---|---|
| committer | 2009-07-08 17:26:05 -0700 | |
| commit | 6698d16b951370a0cc6aa87bcd2ca91122a57410 (patch) | |
| tree | 7a411a1832eec82df97587fddc64b93b9fe909ff /include/ui/CameraHardwareInterface.h | |
| parent | c3f60ddaeadb69c1e85198e609e575f55ecc28ac (diff) | |
| parent | 04c7d0f842ae1d3b52c426fccf7178861493431d (diff) | |
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 2cdcc06abef6..c703f5eeb21b 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); |