summaryrefslogtreecommitdiff
path: root/libs/ui/Camera.cpp
diff options
context:
space:
mode:
author Android (Google) Code Review <android-gerrit@google.com> 2009-07-02 11:00:41 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 2009-07-02 11:00:41 -0700
commitc7396025e59524e7ef639fd86fc23123939ee91c (patch)
treeec0f2b85cab7a18753f1597e612fc28738d4a142 /libs/ui/Camera.cpp
parentd3de90f38d779d28a724e89297c83e6ba1a66fa7 (diff)
parenta1b653d41df9a7999e1dba2a508295671ff6771d (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.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/libs/ui/Camera.cpp b/libs/ui/Camera.cpp
index a481ce7045e3..975594f39e11 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) {