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/V4L2Camera.h

diff --git a/modules/camera/3_4/V4L2Camera.h b/modules/camera/3_4/V4L2Camera.h
index 4ac9cc4..4cc0103 100644
--- a/modules/camera/3_4/V4L2Camera.h
+++ b/modules/camera/3_4/V4L2Camera.h
@@ -21,7 +21,9 @@
 
 #include <string>
 
+#include <nativehelper/ScopedFd.h>
 #include <system/camera_metadata.h>
+
 #include "Camera.h"
 #include "Common.h"
 
@@ -37,6 +39,10 @@
 
 private:
   // default_camera_hal::Camera virtual methods.
+  // Connect to the device: open dev nodes, etc.
+  int connect();
+  // Disconnect from the device: close dev nodes, etc.
+  void disconnect();
   // Initialize static camera characteristics for individual device.
   camera_metadata_t *initStaticInfo();
   // Initialize device info: facing, orientation, resource cost,
@@ -49,6 +55,8 @@
 
   // The camera device path. For example, /dev/video0.
   const std::string mDevicePath;
+  // The opened device fd.
+  ScopedFd mDeviceFd;
 
   DISALLOW_COPY_AND_ASSIGN(V4L2Camera);
 };