From 6c3b4b5fbf128c0e7abbf25356b838574ff2eacf Mon Sep 17 00:00:00 2001
From: SamarV-121 <samarvispute121@pm.me>
Date: Fri, 10 Sep 2021 12:50:57 +0530
Subject: [PATCH] universal7885: power: Include VINTF fragment

Change-Id: I08a6fddc8567c6577156a6bd252bae9b8d6153b6
Signed-off-by: SamarV-121 <samarvispute121@pm.me>
Signed-off-by: roynatech2544 <whiteshell2544@naver.com>
---
 universal7885-common/manifest.xml             | 18 -----------------
 universal7885-common/power/Android.bp         |  1 +
 ...dware.power@1.0-service.universal7884B.xml | 20 +++++++++++++++++++
 3 files changed, 21 insertions(+), 18 deletions(-)
 create mode 100644 universal7885-common/power/android.hardware.power@1.0-service.universal7884B.xml

diff --git a/universal7885-common/manifest.xml b/universal7885-common/manifest.xml
index 343596b..fc160ca 100644
--- a/universal7885-common/manifest.xml
+++ b/universal7885-common/manifest.xml
@@ -146,15 +146,6 @@
             <instance>default</instance>
         </interface>
     </hal>
-    <hal format="hidl">
-        <name>android.hardware.power</name>
-        <transport>hwbinder</transport>
-        <version>1.0</version>
-        <interface>
-            <name>IPower</name>
-            <instance>default</instance>
-        </interface>
-    </hal>
     <hal format="hidl">
         <name>android.hardware.radio</name>
         <transport>hwbinder</transport>
@@ -250,15 +241,6 @@
             <instance>imsd2</instance>
         </interface>
     </hal>
-    <hal format="hidl">
-        <name>vendor.lineage.power</name>
-        <transport>hwbinder</transport>
-        <version>1.0</version>
-        <interface>
-            <name>ILineagePower</name>
-            <instance>default</instance>
-        </interface>
-    </hal>
     <hal format="hidl">
         <name>vendor.lineage.touch</name>
         <transport>hwbinder</transport>
diff --git a/universal7885-common/power/Android.bp b/universal7885-common/power/Android.bp
index 72e02ba..8d8d33e 100644
--- a/universal7885-common/power/Android.bp
+++ b/universal7885-common/power/Android.bp
@@ -38,6 +38,7 @@ cc_binary {
     vendor: true,
 
     init_rc: ["android.hardware.power@1.0-service.universal7884B.rc"],
+    vintf_fragments: ["android.hardware.power@1.0-service.universal7884B.xml"],
     relative_install_path: "hw",
 
 }
diff --git a/universal7885-common/power/android.hardware.power@1.0-service.universal7884B.xml b/universal7885-common/power/android.hardware.power@1.0-service.universal7884B.xml
new file mode 100644
index 0000000..c792d73
--- /dev/null
+++ b/universal7885-common/power/android.hardware.power@1.0-service.universal7884B.xml
@@ -0,0 +1,20 @@
+<manifest version="1.0" type="device">
+    <hal format="hidl">
+        <name>android.hardware.power</name>
+        <transport>hwbinder</transport>
+        <version>1.0</version>
+        <interface>
+            <name>IPower</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
+    <hal format="hidl">
+        <name>vendor.lineage.power</name>
+        <transport>hwbinder</transport>
+        <version>1.0</version>
+        <interface>
+            <name>ILineagePower</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
+</manifest>