summaryrefslogtreecommitdiffstats
path: root/include/ui
diff options
context:
space:
mode:
authorMathias Agopian <mathias@google.com>2009-07-06 14:16:55 -0700
committerMathias Agopian <mathias@google.com>2009-07-06 14:16:55 -0700
commit0f7f88db2771ec6b08df1354f1d85290f93227d5 (patch)
tree63ed23a46b8a32f1f21c734cd430fc88033dc925 /include/ui
parentaf54ab9d889c574b44786e81696e47bdbc9dffd4 (diff)
parentd1d016be5fefc74977b4fe71c0166f7fd5b1172a (diff)
downloadframeworks_native-0f7f88db2771ec6b08df1354f1d85290f93227d5.zip
frameworks_native-0f7f88db2771ec6b08df1354f1d85290f93227d5.tar.gz
frameworks_native-0f7f88db2771ec6b08df1354f1d85290f93227d5.tar.bz2
Merge commit 'goog/master' into merge_master
Diffstat (limited to 'include/ui')
-rw-r--r--include/ui/Camera.h6
1 files changed, 6 insertions, 0 deletions
diff --git a/include/ui/Camera.h b/include/ui/Camera.h
index 97e0e90..e3544ab 100644
--- a/include/ui/Camera.h
+++ b/include/ui/Camera.h
@@ -76,6 +76,12 @@ enum {
CAMERA_MSG_COMPRESSED_IMAGE
};
+// camera fatal errors
+enum {
+ CAMERA_ERROR_UKNOWN = 1,
+ CAMERA_ERROR_SERVER_DIED = 100
+};
+
class ICameraService;
class ICamera;
class Surface;