diff options
| author | 2009-07-02 11:00:41 -0700 | |
|---|---|---|
| committer | 2009-07-02 11:00:41 -0700 | |
| commit | f777ac1a2be695b016dff078d14579483e9c3de9 (patch) | |
| tree | ba141e3c4d359de5d3fb05b526ad13703ffc3155 /libs/ui/Camera.cpp | |
| parent | cf564240ed716da776eee431254a6762840b69de (diff) | |
| parent | 16f3d35459a03bf7fad41df0a0d192d2c50a0594 (diff) | |
Merge change 6084 into donut
* changes:
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 a481ce7045..975594f39e 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) { |