commit e2ce9366d1b138326035c643b7fec68cd2dc83c5
author TreeHugger Robot <treehugger-gerrit@google.com> Thu Feb 09 11:06:25 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Feb 09 11:06:26 2017 +0000
tree ed2019cac1005eafccf01dde9ea4b4b1402d1eaf
parent 76cfc06bda06200df6056e17fbfac8c9db064d44
parent 28ad2eae9ac86df397b27d27fcc92d2c893138af

Merge "Camera: Check for invalid camera during API version calls"

services/camera/libcameraservice/CameraService.cpp

diff --git a/services/camera/libcameraservice/CameraService.cpp b/services/camera/libcameraservice/CameraService.cpp
index b97fece..0547a69 100644
--- a/services/camera/libcameraservice/CameraService.cpp
+++ b/services/camera/libcameraservice/CameraService.cpp
@@ -1878,14 +1878,7 @@
             return STATUS_ERROR(ERROR_ILLEGAL_ARGUMENT, msg.string());
     }
 
-    int facing = -1;
-    int deviceVersion = getDeviceVersion(id, /*out*/ &facing);
-    if (facing == -1) {
-        String8 msg = String8::format("Unable to get facing for camera device %s",
-                id.string());
-        ALOGE("%s: %s", __FUNCTION__, msg.string());
-        return STATUS_ERROR(ERROR_INVALID_OPERATION, msg.string());
-    }
+    int deviceVersion = getDeviceVersion(id);
     switch(deviceVersion) {
         case CAMERA_DEVICE_API_VERSION_1_0:
         case CAMERA_DEVICE_API_VERSION_3_0: