summaryrefslogtreecommitdiff
path: root/libs/ui/Camera.cpp
diff options
context:
space:
mode:
author The Android Open Source Project <initial-contribution@android.com> 2009-05-07 17:51:28 -0700
committer The Android Open Source Project <initial-contribution@android.com> 2009-05-07 17:51:28 -0700
commit3fd7e13960c2763225c5c8bc187bd15da04820dd (patch)
tree9cf36074d5f0a9dd656d62a74393ae3b4dace19d /libs/ui/Camera.cpp
parent8705a41a778bd0561737fd9b6fb2e1cdca0532b5 (diff)
parent538bcd702c0053772245dfbb634c266959cf6af9 (diff)
Merge branch 'donut' of ssh://android-git.corp.google.com:29418/platform/frameworks/base into donut
Diffstat (limited to 'libs/ui/Camera.cpp')
-rw-r--r--libs/ui/Camera.cpp12
1 files changed, 12 insertions, 0 deletions
diff --git a/libs/ui/Camera.cpp b/libs/ui/Camera.cpp
index 41577c45574a..ed4f3b82d830 100644
--- a/libs/ui/Camera.cpp
+++ b/libs/ui/Camera.cpp
@@ -397,6 +397,18 @@ void Camera::errorCallback(status_t error)
}
}
+// callback from camera service
+void Camera::notifyCallback(int32_t msgType, int32_t ext1, int32_t ext2)
+{
+ LOGV("notifyCallback");
+}
+
+// callback from camera service when image is ready
+void Camera::dataCallback(int32_t msgType, const sp<IMemory>& frame)
+{
+ LOGV("dataCallback");
+}
+
void Camera::binderDied(const wp<IBinder>& who) {
LOGW("ICamera died");
if (mErrorCallback) {