diff options
| author | 2009-07-06 11:02:33 -0700 | |
|---|---|---|
| committer | 2009-07-06 11:02:33 -0700 | |
| commit | 4361996a8c4a398d818da4ea453595a0a3404358 (patch) | |
| tree | 4b9751025d02c21ed9473ea3f35e045945b62ebb /libs/ui/Camera.cpp | |
| parent | d356587db388019c552a6a185d9d3d98d24a41aa (diff) | |
| parent | f777ac1a2be695b016dff078d14579483e9c3de9 (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 a72d2c91b7..0aa77ffff6 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) { |