universal8895: Specify internal video devices to ignore by the

 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

diff --git a/configs/external_camera_config.xml b/configs/external_camera_config.xml
new file mode 100644 (file)
index 0000000..50adbaa
--- /dev/null
+++ b/configs/external_camera_config.xml
@@ -0,0 +1,58 @@
+<ExternalCamera>
+    <Provider>
+        <!-- Internal video devices to be ignored by external camera HAL -->
+        <ignore>
+            <id>6</id>
+            <id>7</id>
+            <id>8</id>
+            <id>9</id>
+            <id>12</id>
+            <id>50</id>
+            <id>101</id>
+            <id>102</id>
+            <id>103</id>
+            <id>104</id>
+            <id>109</id>
+            <id>110</id>
+            <id>111</id>
+            <id>112</id>
+            <id>120</id>
+            <id>121</id>
+            <id>122</id>
+            <id>130</id>
+            <id>131</id>
+            <id>132</id>
+            <id>140</id>
+            <id>141</id>
+            <id>142</id>
+            <id>160</id>
+            <id>161</id>
+            <id>170</id>
+            <id>171</id>
+            <id>172</id>
+            <id>173</id>
+            <id>174</id>
+            <id>180</id>
+            <id>190</id>
+            <id>191</id>
+            <id>192</id>
+            <id>193</id>
+            <id>210</id>
+            <id>211</id>
+            <id>212</id>
+            <id>213</id>
+            <id>214</id>
+            <id>215</id>
+            <id>216</id>
+            <id>217</id>
+            <id>218</id>
+            <id>219</id>
+            <id>220</id>
+            <id>221</id>
+            <id>222</id>
+            <id>223</id>
+            <id>224</id>
+            <id>225</id>
+        </ignore>
+    </Provider>
+</ExternalCamera>

diff --git a/device-common.mk b/device-common.mk
index 2fdb81befa64c1ae42c7c968d37e3eb0a93d9f3c..c343dd1560a198683241f869786d769f0ceae7aa 100644 (file)
--- a/device-common.mk
+++ b/device-common.mk
@@ -68,6 +68,10 @@ PRODUCT_PACKAGES += \
     android.hardware.camera.provider@2.4 \
     Snap
 
+# Camera configurations
+PRODUCT_COPY_FILES += \
+    $(LOCAL_PATH)/configs/external_camera_config.xml:$(TARGET_COPY_OUT_VENDOR)/etc/external_camera_config.xml
+
 # Configstore
 PRODUCT_PACKAGES += \
     android.hardware.configstore@1.0-impl \