From 3367babf113bfe318d9e926894d80e705c1560da Mon Sep 17 00:00:00 2001
From: Alexander Koskovich <zvnexus@outlook.com>
Date: Thu, 3 Dec 2020 10:26:15 +0000
Subject: [PATCH] sm8150-common: Disable the usage of ConfigStore.

* As per commit https://github.com/LineageOS/android_hardware_interfaces/commit/11a113a67e87a8da9a9bf0a73883f2325de90934 ("Add disable_configstore").

[SebaUbuntu] Remove manifest entry as well

Change-Id: I5482989a8a96227a3e2a5317eacf613c641bfa8e
---
 common.mk                  | 4 ++++
 configs/vintf/manifest.xml | 9 ---------
 2 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/common.mk b/common.mk
index 0c05bde2..c1f318c6 100644
--- a/common.mk
+++ b/common.mk
@@ -141,6 +141,10 @@ PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \
     ro.surface_flinger.set_display_power_timer_ms=500 \
     ro.surface_flinger.use_content_detection_for_refresh_rate=true
 
+# Disable configstore
+PRODUCT_PACKAGES += \
+    disable_configstore
+
 PRODUCT_VENDOR_PROPERTIES += \
     ro.vendor.display.ad.hdr_calib_data=/vendor/etc/hdr_config.cfg \
     ro.vendor.display.ad.sdr_calib_data=/vendor/etc/sdr_config.cfg \
diff --git a/configs/vintf/manifest.xml b/configs/vintf/manifest.xml
index fa4a8b1c..e05fb034 100644
--- a/configs/vintf/manifest.xml
+++ b/configs/vintf/manifest.xml
@@ -44,15 +44,6 @@
             <instance>legacy/0</instance>
         </interface>
     </hal>
-    <hal format="hidl">
-        <name>android.hardware.configstore</name>
-        <transport>hwbinder</transport>
-        <version>1.1</version>
-        <interface>
-            <name>ISurfaceFlingerConfigs</name>
-            <instance>default</instance>
-        </interface>
-    </hal>
     <hal format="hidl">
         <name>android.hardware.contexthub</name>
         <transport>hwbinder</transport>