From 09167dc1121b5b7124b27f238a9943cab171535f Mon Sep 17 00:00:00 2001 From: Igor Murashkin Date: Tue, 18 Dec 2012 14:05:24 -0800 Subject: [PATCH] Camera2: Return -ENODEV for camera indices out of bounds This allows CameraModuleTest.LoadModuleBadIndices and CameraModuleTest.GetCameraInfoBadIndices to pass. Change-Id: Iffc658b256642ea0684fd8ad864fd273829bb35d --- tools/emulator/system/camera/EmulatedCameraFactory.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/emulator/system/camera/EmulatedCameraFactory.cpp b/tools/emulator/system/camera/EmulatedCameraFactory.cpp index 84248caa6..0964335e3 100755 --- a/tools/emulator/system/camera/EmulatedCameraFactory.cpp +++ b/tools/emulator/system/camera/EmulatedCameraFactory.cpp @@ -196,7 +196,7 @@ int EmulatedCameraFactory::cameraDeviceOpen(int camera_id, hw_device_t** device) if (camera_id < 0 || camera_id >= getEmulatedCameraNum()) { ALOGE("%s: Camera id %d is out of bounds (%d)", __FUNCTION__, camera_id, getEmulatedCameraNum()); - return -EINVAL; + return -ENODEV; } 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()) { ALOGE("%s: Camera id %d is out of bounds (%d)", __FUNCTION__, camera_id, getEmulatedCameraNum()); - return -EINVAL; + return -ENODEV; } return mEmulatedCameras[camera_id]->getCameraInfo(info);