commit 63f69824e48bb48762b082d73c60306b693d3de1
author Ari Hausman-Cohen <arihc@google.com> Fri Jun 10 11:40:35 2016 -0700
committer Ari Hausman-Cohen <arihc@google.com> Tue Jun 14 11:24:41 2016 -0700
tree 62a4b29438a93404a6d6a7177a8ead8d319ea752
parent 77db7d0259d85e55d9caa4896c9bba0fc836e642

Find V4L2 devices from /dev/video*.

Since V4L2CameraHAL now populates its list of cameras,
also added a necessary piece of metadata that was
causing cameraservice to crash.

BUG: 29160300
TEST: Ran on rpi3. HAL finds dev/video* nodes. When a
sym link (/dev/video5 -> /dev/video0) was added, the HAL
correctly did not add a 3rd device.

Change-Id: I95656ac9c062b193c12712b1c73e888bf1f1a961

modules/camera/3_4/V4L2CameraHAL.h

diff --git a/modules/camera/3_4/V4L2CameraHAL.h b/modules/camera/3_4/V4L2CameraHAL.h
index 858ad32..55d84c9 100644
--- a/modules/camera/3_4/V4L2CameraHAL.h
+++ b/modules/camera/3_4/V4L2CameraHAL.h
@@ -48,7 +48,7 @@
   int setTorchMode(const char* camera_id, bool enabled);
 
   // Hardware Module Interface (see <hardware/hardware.h>).
-  int open(const hw_module_t* mod, const char* name, hw_device_t** dev);
+  int openDevice(const hw_module_t* mod, const char* name, hw_device_t** dev);
 
 private:
   // Vector of cameras.