From 473fed5d8a3239c135983af5bef477373ade5950 Mon Sep 17 00:00:00 2001
From: Raghuram Subramani <raghus2247@gmail.com>
Date: Wed, 16 Oct 2024 18:15:29 +0530
Subject: msm8996-common: Switch to QTI Vibrator AIDL

Change-Id: I56840e752ab100f524cf88535837f9de3b568e57
---
 BoardConfigCommon.mk | 4 ++++
 manifest.xml         | 9 ---------
 msm8996.mk           | 4 ++++
 3 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk
index 0d2ae52..95062f1 100644
--- a/BoardConfigCommon.mk
+++ b/BoardConfigCommon.mk
@@ -106,6 +106,10 @@ BOARD_VENDOR_QCOM_LOC_PDK_FEATURE_SET := true
 DEVICE_SPECIFIC_GPS_PATH := $(VENDOR_PATH)/gps
 
 # HIDL
+DEVICE_FRAMEWORK_COMPATIBILITY_MATRIX_FILE := \
+    hardware/qcom-caf/common/vendor_framework_compatibility_matrix.xml \
+    hardware/qcom-caf/common/vendor_framework_compatibility_matrix_legacy.xml \
+    vendor/lineage/config/device_framework_matrix.xml
 DEVICE_FRAMEWORK_MANIFEST_FILE := $(VENDOR_PATH)/framework_manifest.xml
 DEVICE_MANIFEST_FILE := $(VENDOR_PATH)/manifest.xml
 DEVICE_MATRIX_FILE := hardware/qcom-caf/common/compatibility_matrix.xml
diff --git a/manifest.xml b/manifest.xml
index 854923a..87b530d 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -199,15 +199,6 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
             <instance>default</instance>
         </interface>
     </hal>
-    <hal format="hidl">
-        <name>android.hardware.vibrator</name>
-        <transport>hwbinder</transport>
-        <version>1.0</version>
-        <interface>
-            <name>IVibrator</name>
-            <instance>default</instance>
-        </interface>
-    </hal>
     <hal format="hidl">
         <name>com.qualcomm.qti.dpm.api</name>
         <transport>hwbinder</transport>
diff --git a/msm8996.mk b/msm8996.mk
index acea036..6763560 100755
--- a/msm8996.mk
+++ b/msm8996.mk
@@ -398,6 +398,10 @@ PRODUCT_SYSTEM_VERITY_PARTITION=/dev/block/bootdevice/by-name/system
 PRODUCT_VENDOR_VERITY_PARTITION=/dev/block/bootdevice/by-name/factory
 $(call inherit-product, build/target/product/verity.mk)
 
+# Vibrator
+PRODUCT_PACKAGES += \
+    vendor.qti.hardware.vibrator.service
+
 # WiFi
 PRODUCT_PACKAGES += \
     android.hardware.wifi-service \
-- 
cgit v1.2.3