diff options
| author | Shuzhen Wang <shuzhenw@codeaurora.org> | 2013-04-17 14:37:44 -0700 |
|---|---|---|
| committer | Iliyan Malchev <malchev@google.com> | 2013-04-22 13:30:42 -0700 |
| commit | 4ed4f745b63c481b59d7e12e0602b14cc5a1fd88 (patch) | |
| tree | 87c54a3273434ef313b270d4289be8d85d38b553 | |
| parent | 50a68e4aae2d8378d0559f54eeb979d218ff14a5 (diff) | |
| download | mako-4ed4f745b63c481b59d7e12e0602b14cc5a1fd88.tar.gz | |
Camera: Report error when multiple camera instances opened.
Report INVALID_OPERATION error to framework if framework requests
multiple camera instances at the same time.
Bug: 8322788
Change-Id: I9dd7904603b4cfa2ae9bb459bc2a314f28bd5296
Signed-off-by: Iliyan Malchev <malchev@google.com>
| -rwxr-xr-x | camera/QualcommCamera2.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/camera/QualcommCamera2.cpp b/camera/QualcommCamera2.cpp index c495adb..009539d 100755 --- a/camera/QualcommCamera2.cpp +++ b/camera/QualcommCamera2.cpp @@ -188,10 +188,11 @@ extern "C" int camera_device_open( pthread_mutex_lock(&camera_session_lock); + //Return INVALID_OPERATION(-1) to framework if multiple camera instances detected. if(QCameraSession) { ALOGE("%s Mutliple camera open instances are not supported",__func__); pthread_mutex_unlock(&camera_session_lock); - return NULL; + return rc; } if(module && id && hw_device) { int cameraId = atoi(id); |