summaryrefslogtreecommitdiffstats
path: root/libcamera/SecCameraHWInterface.cpp
diff options
context:
space:
mode:
authorSimon Wilson <simonwilson@google.com>2010-10-27 11:13:40 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-10-27 11:13:40 -0700
commitb640318cdce6d15d6397ed5cc9b1617ee0788e59 (patch)
tree2725b5471145ad11bbc347adc31b866a1314f993 /libcamera/SecCameraHWInterface.cpp
parentfc4f4fbf7d8d687956f56fc87890471f87b060a3 (diff)
parent0937d4d82251bb3c10c614f9681d29c48c5e0ef5 (diff)
downloaddevice_samsung_crespo-b640318cdce6d15d6397ed5cc9b1617ee0788e59.zip
device_samsung_crespo-b640318cdce6d15d6397ed5cc9b1617ee0788e59.tar.gz
device_samsung_crespo-b640318cdce6d15d6397ed5cc9b1617ee0788e59.tar.bz2
am 0937d4d8: am 7e433f40: Merge "libcamera: don\'t invoke callback when startPreview fails" into gingerbread
Diffstat (limited to 'libcamera/SecCameraHWInterface.cpp')
-rw-r--r--libcamera/SecCameraHWInterface.cpp3
1 files changed, 0 insertions, 3 deletions
diff --git a/libcamera/SecCameraHWInterface.cpp b/libcamera/SecCameraHWInterface.cpp
index 53f1aab..d2047c1 100644
--- a/libcamera/SecCameraHWInterface.cpp
+++ b/libcamera/SecCameraHWInterface.cpp
@@ -633,9 +633,6 @@ status_t CameraHardwareSec::startPreview()
if (ret < 0) {
LOGE("ERR(%s):Fail on mSecCamera->startPreview()", __func__);
- if (mMsgEnabled & CAMERA_MSG_ERROR) {
- mNotifyCb(CAMERA_MSG_ERROR, -2, 0, mCallbackCookie);
- }
return -1; //UNKNOWN_ERROR;
}