LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Camera2: Return -ENODEV for camera indices out of bounds

Browse Source 
This allows CameraModuleTest.LoadModuleBadIndices and
CameraModuleTest.GetCameraInfoBadIndices to pass.

Change-Id: Iffc658b256642ea0684fd8ad864fd273829bb35d
This commit is contained in:
Igor Murashkin
2012-12-18 14:05:24 -08:00
parent 871e2f54ab
commit 09167dc112
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tools/emulator/system/camera/EmulatedCameraFactory.cpp
View File

@@ -196,7 +196,7 @@ int EmulatedCameraFactory::cameraDeviceOpen(int camera_id, hw_device_t** device)
if (camera_id < 0 || camera_id >= getEmulatedCameraNum()) { if (camera_id < 0 || camera_id >= getEmulatedCameraNum()) {
ALOGE("%s: Camera id %d is out of bounds (%d)", ALOGE("%s: Camera id %d is out of bounds (%d)",
__FUNCTION__, camera_id, getEmulatedCameraNum()); __FUNCTION__, camera_id, getEmulatedCameraNum());
return -EINVAL; return -ENODEV;
} }
return mEmulatedCameras[camera_id]->connectCamera(device); return mEmulatedCameras[camera_id]->connectCamera(device);
@@ -214,7 +214,7 @@ int EmulatedCameraFactory::getCameraInfo(int camera_id, struct camera_info* info
if (camera_id < 0 || camera_id >= getEmulatedCameraNum()) { if (camera_id < 0 || camera_id >= getEmulatedCameraNum()) {
ALOGE("%s: Camera id %d is out of bounds (%d)", ALOGE("%s: Camera id %d is out of bounds (%d)",
__FUNCTION__, camera_id, getEmulatedCameraNum()); __FUNCTION__, camera_id, getEmulatedCameraNum());
return -EINVAL; return -ENODEV;
} }
return mEmulatedCameras[camera_id]->getCameraInfo(info); return mEmulatedCameras[camera_id]->getCameraInfo(info);