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
@@ -70,15 +70,6 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
         </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>
         <fqname>@1.2::ICryptoFactory/clearkey</fqname>
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