From 5de0a2a3311433c7ec58759d0b4d789ef6ae9e32 Mon Sep 17 00:00:00 2001
From: Volodymyr Zhdanov <wight554@gmail.com>
Date: Mon, 12 Jun 2023 18:14:17 +0800
Subject: [PATCH] sdm660-common: device: Disable configstore usage

* it's finally deprecated in R
* ship disable_configstore because we have API level less than 29
---
 manifest.xml | 10 ----------
 sdm710.mk    |  3 +++
 2 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/manifest.xml b/manifest.xml
index 1647a75..4f4a150 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -69,16 +69,6 @@
         </interface>
         <fqname>@2.4::ICameraProvider/legacy/0</fqname>
     </hal>
-    <hal format="hidl">
-        <name>android.hardware.configstore</name>
-        <transport>hwbinder</transport>
-        <version>1.1</version>
-        <interface>
-            <name>ISurfaceFlingerConfigs</name>
-            <instance>default</instance>
-        </interface>
-        <fqname>@1.1::ISurfaceFlingerConfigs/default</fqname>
-    </hal>
     <hal format="hidl">
         <name>android.hardware.contexthub</name>
         <transport>hwbinder</transport>
diff --git a/sdm710.mk b/sdm710.mk
index 4737ea9..3d9672a 100644
--- a/sdm710.mk
+++ b/sdm710.mk
@@ -153,6 +153,9 @@ PRODUCT_PACKAGES += \
     android.hardware.contexthub@1.0-impl.generic \
     android.hardware.contexthub@1.0-service
 
+PRODUCT_PACKAGES += \
+    disable_configstore
+
 # Display
 PRODUCT_PACKAGES += \
     android.hardware.graphics.composer@2.3-service \