commit 345bd3a19b0723fd078b97487516ad98e277a8f4
author Ari Hausman-Cohen <arihc@google.com> Mon Jun 13 15:33:53 2016 -0700
committer Ari Hausman-Cohen <arihc@google.com> Tue Jun 14 13:35:45 2016 -0700
tree 810ca7c19f4544e16f6d0fbc6085c9e153f22c5f
parent 63f69824e48bb48762b082d73c60306b693d3de1

Open and close v4l2 devices.

BUG: 29191881
Change-Id: Id740ab30fd8f79b4a2cb99d1e5bef2be7472c992

modules/camera/3_4/V4L2CameraHAL.cpp

diff --git a/modules/camera/3_4/V4L2CameraHAL.cpp b/modules/camera/3_4/V4L2CameraHAL.cpp
index ec99a4c..6696ba5 100644
--- a/modules/camera/3_4/V4L2CameraHAL.cpp
+++ b/modules/camera/3_4/V4L2CameraHAL.cpp
@@ -30,6 +30,8 @@
 #include <cstdlib>
 #include <unordered_set>
 
+#include <android-base/parseint.h>
+
 #include "Common.h"
 #include "V4L2Camera.h"
 
@@ -46,22 +48,6 @@
 // Default global camera hal.
 static V4L2CameraHAL gCameraHAL;
 
-// Helper function for converting and validating string name to int id.
-// Returns either a non-negative camera id, or a negative error code.
-static int id_from_name(const char* name) {
-  if (name == NULL || *name == '\0') {
-    HAL_LOGE("Invalid camera id name is NULL");
-    return -EINVAL;
-  }
-  char* nameEnd;
-  int id = strtol(name, &nameEnd, 10);
-  if (*nameEnd != '\0' || id < 0) {
-    HAL_LOGE("Invalid camera id name %s", name);
-    return -EINVAL;
-  }
-  return id;
-}
-
 V4L2CameraHAL::V4L2CameraHAL() : mCameras(), mCallbacks(NULL) {
   HAL_LOG_ENTER();
   // Adds all available V4L2 devices.
@@ -171,14 +157,12 @@
     return -EINVAL;
   }
 
-  int id = id_from_name(name);
-  if (id < 0) {
-    return id;
-  } else if (id < 0 || id >= mCameras.size()) {
+  int id;
+  if (!android::base::ParseInt(name, &id, 0, getNumberOfCameras() - 1)) {
     return -EINVAL;
   }
   // TODO(b/29185945): Hotplugging: return -EINVAL if unplugged.
-  return mCameras[id]->open(module, device);
+  return mCameras[id]->openDevice(module, device);
 }
 
 /*