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/ICameraClient.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/ICameraClient.h')
| -rw-r--r-- | include/ui/ICameraClient.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/ui/ICameraClient.h b/include/ui/ICameraClient.h index f38a6aa..236d0f6 100644 --- a/include/ui/ICameraClient.h +++ b/include/ui/ICameraClient.h @@ -21,6 +21,7 @@ #include <binder/IInterface.h> #include <binder/Parcel.h> #include <binder/IMemory.h> +#include <utils/Timers.h> namespace android { @@ -31,7 +32,7 @@ public: virtual void notifyCallback(int32_t msgType, int32_t ext1, int32_t ext2) = 0; virtual void dataCallback(int32_t msgType, const sp<IMemory>& data) = 0; - + virtual void dataCallbackTimestamp(nsecs_t timestamp, int32_t msgType, const sp<IMemory>& data) = 0; }; // ---------------------------------------------------------------------------- |