From b6c06ebf02afb192980e611550e9090f080afb31 Mon Sep 17 00:00:00 2001
From: Alexander Koskovich <zvnexus@outlook.com>
Date: Thu, 3 Dec 2020 10:26:15 +0000
Subject: msm8996-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
---
 manifest.xml | 9 ---------
 msm8996.mk   | 4 ++++
 2 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/manifest.xml b/manifest.xml
index 4f9e635..ad8ad52 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -69,15 +69,6 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
             <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.drm</name>
         <transport>hwbinder</transport>
diff --git a/msm8996.mk b/msm8996.mk
index 2fa6d84..333e6c5 100755
--- a/msm8996.mk
+++ b/msm8996.mk
@@ -155,6 +155,10 @@ PRODUCT_PACKAGES += \
     init.wlan.sh \
     ueventd.qcom.rc
 
+# Configstore
+PRODUCT_PACKAGES += \
+    disable_configstore
+
 # ConfigPanel
 PRODUCT_PACKAGES += \
     ConfigPanel
-- 
cgit v1.2.3