Merge branch 'donut' of ssh://android-git.corp.google.com:29418/platform/frameworks/base into donut

2 files changed, 21 insertions, 0 deletions

diff --git a/include/ui/Camera.h b/include/ui/Camera.h
index fd851d9efc..901c7a98f9 100644
--- a/include/ui/Camera.h
+++ b/include/ui/Camera.h
@@ -143,6 +143,8 @@ public:
     virtual void        errorCallback(status_t error);
     virtual void        autoFocusCallback(bool focused);
     virtual void        recordingCallback(const sp<IMemory>& frame);
+    virtual void        notifyCallback(int32_t msgType, int32_t ext, int32_t ext2);
+    virtual void        dataCallback(int32_t msgType, const sp<IMemory>& frame);
 
     sp<ICamera>         remote();
 
diff --git a/include/ui/ICameraClient.h b/include/ui/ICameraClient.h
index 73b951cf3c..1645ef8026 100644
--- a/include/ui/ICameraClient.h
+++ b/include/ui/ICameraClient.h
@@ -29,6 +29,23 @@ class ICameraClient: public IInterface
 public:
     DECLARE_META_INTERFACE(CameraClient);
 
+    // msgType in notifyCallback function
+    enum {
+        ERROR,
+        SHUTTER,
+        FOCUSED,
+        ZOOM
+    } notify_callback_message_type;
+
+    // msgType in dataCallback function
+    enum {
+        PREVIEW,
+        RECORD,
+        POSTVIEW,
+        RAW,
+        COMPRESSED
+    } data_callback_message_type;
+
     virtual void            shutterCallback() = 0;
     virtual void            rawCallback(const sp<IMemory>& picture) = 0;
     virtual void            jpegCallback(const sp<IMemory>& picture) = 0;
@@ -36,6 +53,8 @@ public:
     virtual void            errorCallback(status_t error) = 0;
     virtual void            autoFocusCallback(bool focused) = 0;
     virtual void            recordingCallback(const sp<IMemory>& frame) = 0;
+    virtual void            notifyCallback(int32_t msgType, int32_t ext1, int32_t ext2) = 0;
+    virtual void            dataCallback(int32_t msgType, const sp<IMemory>& data) = 0;
 
 };