From f7b5a79d5c51d79d98723a800b0712efc18db30b Mon Sep 17 00:00:00 2001
From: Sebastiano Barezzi <barezzisebastiano@gmail.com>
Date: Thu, 23 Sep 2021 19:00:15 +0200
Subject: [PATCH] Revert "sm6250-common: Update camera provider service to
 2.5."

* Reason for revert: camera HAL doesn't implement notifyDeviceStateChange.

This reverts commit 2ac59b869bed37bfaa480411ff98eed8991285f3.

Change-Id: I7919e0c0160a4108c9d066e914211cb4daa9c24b
---
 atoll.mk     | 3 ++-
 manifest.xml | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/atoll.mk b/atoll.mk
index c723376..42f38be 100644
--- a/atoll.mk
+++ b/atoll.mk
@@ -88,7 +88,8 @@ PRODUCT_PACKAGES += \
 
 # Camera
 PRODUCT_PACKAGES += \
-    android.hardware.camera.provider@2.5-service_64
+    android.hardware.camera.provider@2.4-impl \
+    android.hardware.camera.provider@2.4-service_64
 
 PRODUCT_PACKAGES += \
     libcamera2ndk_vendor \
diff --git a/manifest.xml b/manifest.xml
index 3ac89dc..eb44c0e 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -22,7 +22,7 @@
     <hal format="hidl">
         <name>android.hardware.camera.provider</name>
         <transport>hwbinder</transport>
-        <fqname>@2.5::ICameraProvider/legacy/0</fqname>
+        <fqname>@2.4::ICameraProvider/legacy/0</fqname>
     </hal>
     <hal format="hidl" override="true">
         <name>android.hardware.contexthub</name>