From 89cc54cb2361719ae484bf16e1c5dd96ac9497d5 Mon Sep 17 00:00:00 2001
From: Daniel Jarai <jaraidaniel@gmail.com>
Date: Sun, 2 Sep 2018 00:34:14 +0200
Subject: [PATCH] sanders: camera: Specify internal video devices to ignore by
 external provider

The external camera provider occupies our camera V4L2 nodes, potentially
crashing the kernel driver and blocking the camera HAL.
Unfortunately, there's no easy way to just disable it, so let's just tell
it to ignore the internal video devices.

Change-Id: I00c67de1b94a1f7eca1bf458d1d0e4de3507aa81
Signed-off-by: Daniel Jarai <jaraidaniel@gmail.com>
---
 configs/external_camera_config.xml | 14 ++++++++++++++
 device.mk                          |  3 ++-
 2 files changed, 16 insertions(+), 1 deletion(-)
 create mode 100644 configs/external_camera_config.xml

diff --git a/configs/external_camera_config.xml b/configs/external_camera_config.xml
new file mode 100644
index 0000000..3b614e2
--- /dev/null
+++ b/configs/external_camera_config.xml
@@ -0,0 +1,14 @@
+<ExternalCamera>
+    <Provider>
+        <!-- Internal video devices to be ignored by external camera HAL -->
+        <ignore>
+            <id>0</id>
+            <id>1</id>
+            <id>2</id>
+            <id>3</id>
+            <id>38</id>
+            <id>39</id>
+            <id>100</id>
+        </ignore>
+    </Provider>
+</ExternalCamera>
diff --git a/device.mk b/device.mk
index fdfad1d..fdc9657 100644
--- a/device.mk
+++ b/device.mk
@@ -119,7 +119,8 @@ PRODUCT_COPY_FILES += \
     $(LOCAL_PATH)/configs/camera/mot_s5k3l8_bear_chromatix.xml:$(TARGET_COPY_OUT_VENDOR)/etc/camera/mot_s5k3l8_bear_chromatix.xml \
     $(LOCAL_PATH)/configs/camera/mot_s5k3l8_mono_chromatix.xml:$(TARGET_COPY_OUT_VENDOR)/etc/camera/mot_s5k3l8_mono_chromatix.xml \
     $(LOCAL_PATH)/configs/camera/msm8953_mot_sanders_camera.xml:$(TARGET_COPY_OUT_VENDOR)/etc/camera/msm8953_mot_sanders_camera.xml \
-    $(LOCAL_PATH)/configs/camera/s5k4h8_chromatix.xml:$(TARGET_COPY_OUT_VENDOR)/etc/camera/s5k4h8_chromatix.xml
+    $(LOCAL_PATH)/configs/camera/s5k4h8_chromatix.xml:$(TARGET_COPY_OUT_VENDOR)/etc/camera/s5k4h8_chromatix.xml \
+    $(LOCAL_PATH)/configs/external_camera_config.xml:$(TARGET_COPY_OUT_VENDOR)/etc/external_camera_config.xml
 
 # Display
 PRODUCT_PACKAGES += \