diff options
| author | Android (Google) Code Review <android-gerrit@google.com> | 2009-07-06 11:02:33 -0700 |
|---|---|---|
| committer | The Android Open Source Project <initial-contribution@android.com> | 2009-07-06 11:02:33 -0700 |
| commit | fee47b699f51e52d3551c0fdbcc9fc2760a0d837 (patch) | |
| tree | 523fa403953da0a0ea8fda6d183d41dc4c55ebf9 /include | |
| parent | 1eebdc04f04923f827f9346f4cf126d245330f89 (diff) | |
| parent | c7396025e59524e7ef639fd86fc23123939ee91c (diff) | |
| download | frameworks_base-fee47b699f51e52d3551c0fdbcc9fc2760a0d837.zip frameworks_base-fee47b699f51e52d3551c0fdbcc9fc2760a0d837.tar.gz frameworks_base-fee47b699f51e52d3551c0fdbcc9fc2760a0d837.tar.bz2 | |
am c7396025: Merge change 6084 into donut
Merge commit 'c7396025e59524e7ef639fd86fc23123939ee91c'
* commit 'c7396025e59524e7ef639fd86fc23123939ee91c':
Return CAMERA_ERROR_SERVER_DIED to camera app when camera service dies (bug 1956726)
Diffstat (limited to 'include')
| -rw-r--r-- | include/ui/Camera.h | 6 |
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; |