From b84f00f105be7e5807ae8533c97db168aeafafcb Mon Sep 17 00:00:00 2001
From: ivanmeler <i_ivan@windowslive.com>
Date: Fri, 5 May 2023 12:36:10 +0000
Subject: [PATCH] wip: fix camera again

---
 manifest.xml | 2 +-
 msm8996.mk   | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/manifest.xml b/manifest.xml
index a57ae70..793fe89 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -28,7 +28,7 @@
     </hal>
     <hal format="hidl">
         <name>android.hardware.camera.provider</name>
-        <transport arch="32">passthrough</transport>
+        <transport>hwbinder</transport>
         <version>2.4</version>
         <interface>
             <name>ICameraProvider</name>
diff --git a/msm8996.mk b/msm8996.mk
index 36853e7..ecc8f93 100755
--- a/msm8996.mk
+++ b/msm8996.mk
@@ -131,11 +131,9 @@ PRODUCT_PACKAGES += \
 
 # Camera
 PRODUCT_PACKAGES += \
-    android.frameworks.cameraservice.common@2.0.vendor:32 \
-    android.frameworks.cameraservice.device@2.0.vendor:32 \
-    android.frameworks.cameraservice.service@2.1.vendor:32 \
     android.frameworks.displayservice@1.0 \
     android.hardware.camera.provider@2.4-impl:32 \
+    android.hardware.camera.provider@2.4-service \
     vendor.qti.hardware.camera.device@1.0 \
     libshims_cameraclient