From 7c8cc92d1b94785ad998facb02a6c261dc1e5c24 Mon Sep 17 00:00:00 2001
From: Konsta <konsta09@gmail.com>
Date: Sat, 13 Jan 2024 18:32:25 +0200
Subject: [PATCH] external camera: switch to aidl

---
 device.mk    | 2 +-
 manifest.xml | 9 ++++++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/device.mk b/device.mk
index 87f9d2a..8110758 100644
--- a/device.mk
+++ b/device.mk
@@ -90,7 +90,7 @@ PRODUCT_COPY_FILES += \
 
 # Camera
 PRODUCT_PACKAGES += \
-    android.hardware.camera.provider@2.5-external-service
+    android.hardware.camera.provider-V1-external-service
 
 PRODUCT_COPY_FILES += \
     $(DEVICE_PATH)/camera/external_camera_config.xml:$(TARGET_COPY_OUT_VENDOR)/etc/external_camera_config.xml
diff --git a/manifest.xml b/manifest.xml
index 3d06282..3c90b20 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -26,13 +26,20 @@
             <instance>default</instance>
         </interface>
     </hal>
+    <hal format="aidl">
+        <name>android.hardware.camera.provider</name>
+        <version>1</version>
+        <interface>
+            <name>ICameraProvider</name>
+            <instance>external/0</instance>
+        </interface>
+    </hal>
     <hal format="hidl">
         <name>android.hardware.camera.provider</name>
         <transport>hwbinder</transport>
         <version>2.5</version>
         <interface>
             <name>ICameraProvider</name>
-            <instance>external/0</instance>
             <instance>legacy/0</instance>
         </interface>
     </hal>