diff options
| author | Android (Google) Code Review <android-gerrit@google.com> | 2009-07-08 17:28:14 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2009-07-08 17:28:14 -0700 |
| commit | ec109bdd3982590709155006c1eb2e70c33015f0 (patch) | |
| tree | 986a23c60a13e7b68b9938b29251b59bc1e6c168 /core | |
| parent | b426703c1944aed7148be288d2c4b28bca4b75fc (diff) | |
| parent | 6698d16b951370a0cc6aa87bcd2ca91122a57410 (diff) | |
| download | frameworks_base-ec109bdd3982590709155006c1eb2e70c33015f0.zip frameworks_base-ec109bdd3982590709155006c1eb2e70c33015f0.tar.gz frameworks_base-ec109bdd3982590709155006c1eb2e70c33015f0.tar.bz2 | |
Merge change 6560
* changes:
resolved conflicts for merge of 04c7d0f8 to master
Diffstat (limited to 'core')
| -rw-r--r-- | core/jni/android_hardware_Camera.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/core/jni/android_hardware_Camera.cpp b/core/jni/android_hardware_Camera.cpp index 83d2502..676ca3a 100644 --- a/core/jni/android_hardware_Camera.cpp +++ b/core/jni/android_hardware_Camera.cpp @@ -55,6 +55,7 @@ public: ~JNICameraContext() { release(); } virtual void notify(int32_t msgType, int32_t ext1, int32_t ext2); virtual void postData(int32_t msgType, const sp<IMemory>& dataPtr); + virtual void postDataTimestamp(nsecs_t timestamp, int32_t msgType, const sp<IMemory>& dataPtr); sp<Camera> getCamera() { Mutex::Autolock _l(mLock); return mCamera; } void release(); @@ -188,6 +189,12 @@ void JNICameraContext::postData(int32_t msgType, const sp<IMemory>& dataPtr) } } +void JNICameraContext::postDataTimestamp(nsecs_t timestamp, int32_t msgType, const sp<IMemory>& dataPtr) +{ + // TODO: plumb up to Java. For now, just drop the timestamp + postData(msgType, dataPtr); +} + // connect to camera service static void android_hardware_Camera_native_setup(JNIEnv *env, jobject thiz, jobject weak_this) { |