diff options
| author | 2009-07-06 11:02:33 -0700 | |
|---|---|---|
| committer | 2009-07-06 11:02:33 -0700 | |
| commit | fee47b699f51e52d3551c0fdbcc9fc2760a0d837 (patch) | |
| tree | 523fa403953da0a0ea8fda6d183d41dc4c55ebf9 /libs/ui/Camera.cpp | |
| parent | 1eebdc04f04923f827f9346f4cf126d245330f89 (diff) | |
| parent | c7396025e59524e7ef639fd86fc23123939ee91c (diff) | |
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 'libs/ui/Camera.cpp')
| -rw-r--r-- | libs/ui/Camera.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libs/ui/Camera.cpp b/libs/ui/Camera.cpp index a72d2c91b7e9..0aa77ffff614 100644 --- a/libs/ui/Camera.cpp +++ b/libs/ui/Camera.cpp @@ -312,7 +312,7 @@ void Camera::dataCallback(int32_t msgType, const sp<IMemory>& dataPtr) void Camera::binderDied(const wp<IBinder>& who) { LOGW("ICamera died"); - notifyCallback(CAMERA_MSG_ERROR, DEAD_OBJECT, 0); + notifyCallback(CAMERA_MSG_ERROR, CAMERA_ERROR_SERVER_DIED, 0); } void Camera::DeathNotifier::binderDied(const wp<IBinder>& who) { |