From 96610639f6e86bee5835c4b83b3dce9f94faffa3 Mon Sep 17 00:00:00 2001
From: DennySPb <dennyspb@gmail.com>
Date: Thu, 10 Dec 2020 13:33:58 +0300
Subject: [PATCH] manifest: move livedisplay and powerstats hals to device
 manifest

Signed-off-by: DennySPb <dennyspb@gmail.com>
Change-Id: I6cc570579d5a46de3ead668b1c2b71be240f25a6
Signed-off-by: DennySPb <dennyspb@gmail.com>
---
 BoardConfig.mk         |  1 -
 framework_manifest.xml | 19 -------------------
 manifest.xml           | 17 +++++++++++++++++
 3 files changed, 17 insertions(+), 20 deletions(-)
 delete mode 100644 framework_manifest.xml

diff --git a/BoardConfig.mk b/BoardConfig.mk
index 7089eb9..191b1ac 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -79,7 +79,6 @@ BOARD_HAS_QCA_FM_SOC := "cherokee"
 TARGET_ADDITIONAL_GRALLOC_10_USAGE_BITS := 0x200000U | 0x2000U
 
 # HIDL
-DEVICE_FRAMEWORK_MANIFEST_FILE := $(DEVICE_PATH)/framework_manifest.xml
 DEVICE_MANIFEST_FILE := $(DEVICE_PATH)/manifest.xml
 DEVICE_MATRIX_FILE := $(DEVICE_PATH)/compatibility_matrix.xml
 
diff --git a/framework_manifest.xml b/framework_manifest.xml
deleted file mode 100644
index 4abca30..0000000
--- a/framework_manifest.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<manifest version="1.0" type="framework">
-    <hal format="hidl" override="true">
-        <name>android.hardware.power</name>
-        <transport>hwbinder</transport>
-    </hal>     
-    <hal format="hidl" override="true">
-        <name>vendor.qti.hardware.perf</name>
-        <transport>hwbinder</transport>
-    </hal>
-    <hal format="hidl">
-        <name>vendor.lineage.livedisplay</name>
-        <transport>hwbinder</transport>
-        <version>2.0</version>
-        <interface>
-            <name>IPictureAdjustment</name>
-            <instance>default</instance>
-        </interface>
-    </hal>
-</manifest>
diff --git a/manifest.xml b/manifest.xml
index d21f3ed..1da404a 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -669,4 +669,21 @@
         </interface>
         <fqname>@2.1::IRTPService/imsrtpservice</fqname>
     </hal>
+    <hal format="hidl">
+        <name>vendor.lineage.livedisplay</name>
+        <transport>hwbinder</transport>
+        <version>2.0</version>
+        <interface>
+            <name>IDisplayModes</name>
+            <instance>default</instance>
+        </interface>
+        <interface>
+            <name>IPictureAdjustment</name>
+            <instance>default</instance>
+        </interface>
+        <interface>
+            <name>ISunlightEnhancement</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
 </manifest>