Revert "trinket-common: Disable the usage of ConfigStore"HEADq10.0

This reverts commit 10315c3bf6a4957d52c8baba528b9c5144962c6d.

Reason for revert: Build fix

Change-Id: I44109f1154c11677c4fef4317d84da45aee2a03a

2 files changed, 9 insertions, 4 deletions

diff --git a/configs/hidl/manifest.xml b/configs/hidl/manifest.xml
index b91a696f..985117bf 100644
--- a/configs/hidl/manifest.xml
+++ b/configs/hidl/manifest.xml
@@ -54,6 +54,15 @@
         </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>
         <version>1.0</version>
diff --git a/trinket.mk b/trinket.mk
index fb2bbdd3..a3d57e05 100644
--- a/trinket.mk
+++ b/trinket.mk
@@ -83,10 +83,6 @@ PRODUCT_PACKAGES += \
     com.quicinc.cne \
     services-ext
 
-# Config Store
-PRODUCT_PACKAGES += \
-    disable_configstore
-
 # Display/Graphics
 PRODUCT_AAPT_CONFIG := normal
 PRODUCT_AAPT_PREF_CONFIG := xxhdpi