commit ad3770a20daf1265a088404edbd2ca340166e9ef
author Zhijun He <zhijunhe@google.com> Fri May 02 18:45:46 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri May 02 18:45:46 2014 +0000
tree c45661596cf8287ac490f2e293d4288ac34cffd2
parent 33a610c4a79975eb585526195a7c8eae8177777b
parent e11ae4b2f7d38c8092e7c67ff06610165d866d98

Merge "Camera3: Don't notifyError for non-fatal errors"

services/camera/libcameraservice/device3/Camera3Device.cpp

diff --git a/services/camera/libcameraservice/device3/Camera3Device.cpp b/services/camera/libcameraservice/device3/Camera3Device.cpp
index 2f874f5..16d6f42 100644
--- a/services/camera/libcameraservice/device3/Camera3Device.cpp
+++ b/services/camera/libcameraservice/device3/Camera3Device.cpp
@@ -1936,9 +1936,6 @@
                 if (msg->message.error.error_code == CAMERA3_MSG_ERROR_DEVICE) {
                     listener->notifyError(ICameraDeviceCallbacks::ERROR_CAMERA_DEVICE,
                                           resultExtras);
-                } else {
-                    listener->notifyError(ICameraDeviceCallbacks::ERROR_CAMERA_SERVICE,
-                                          resultExtras);
                 }
             } else {
                 ALOGE("Camera %d: %s: no listener available", mId, __FUNCTION__);