From e2025cf699d3e30370d9b3f376280f4c5eacf804 Mon Sep 17 00:00:00 2001
From: Volodymyr Zhdanov <wight554@gmail.com>
Date: Tue, 6 Oct 2020 10:22:40 +0300
Subject: [PATCH] sm6250-common: disable configstore

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

diff --git a/common.mk b/common.mk
index 86f22d9..48e1d4e 100644
--- a/common.mk
+++ b/common.mk
@@ -79,6 +79,10 @@ PRODUCT_COPY_FILES += \
     frameworks/native/data/etc/android.hardware.camera.full.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.camera.full.xml \
     frameworks/native/data/etc/android.hardware.camera.raw.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.camera.raw.xml
 
+# Display
+PRODUCT_PACKAGES += \
+    disable_configstore
+
 # DRM
 PRODUCT_PACKAGES += \
     android.hardware.drm@1.2-service.clearkey
diff --git a/manifest.xml b/manifest.xml
index 5f2a6bc..0be198a 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -59,16 +59,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.drm</name>
         <transport>hwbinder</transport>