From 1beb846064701c4e9cbd34f6628a514c266dc5e3 Mon Sep 17 00:00:00 2001
From: Sebastiano Barezzi <barezzisebastiano@gmail.com>
Date: Sat, 19 Jun 2021 11:46:02 +0200
Subject: [PATCH] sm6375-common: vibrator: Rebrand to Xiaomi SM6375

Change-Id: Icd0ec7c857574caec085751253fafa39be065d0d
---
 holi.mk                                                |  4 ++++
 sepolicy/vendor/file_contexts                          |  3 +++
 vibrator/Android.bp                                    | 10 +++++-----
 vibrator/Vibrator.cpp                                  |  2 +-
 vibrator/service.cpp                                   |  2 +-
 vibrator/vendor.qti.hardware.vibrator.service.rc       |  4 ----
 ...vendor.qti.hardware.vibrator.service.xiaomi_holi.rc |  4 ++++
 ...ndor.qti.hardware.vibrator.service.xiaomi_holi.xml} |  0
 8 files changed, 18 insertions(+), 11 deletions(-)
 delete mode 100644 vibrator/vendor.qti.hardware.vibrator.service.rc
 create mode 100644 vibrator/vendor.qti.hardware.vibrator.service.xiaomi_holi.rc
 rename vibrator/{vendor.qti.hardware.vibrator.service.xml => vendor.qti.hardware.vibrator.service.xiaomi_holi.xml} (100%)

diff --git a/holi.mk b/holi.mk
index 2558a8d..c918b15 100644
--- a/holi.mk
+++ b/holi.mk
@@ -269,5 +269,9 @@ PRODUCT_PACKAGES += \
 PRODUCT_SOONG_NAMESPACES += \
     vendor/qcom/opensource/usb/etc
 
+# Vibrator
+PRODUCT_PACKAGES += \
+    vendor.qti.hardware.vibrator.service.xiaomi_holi
+
 # Inherit the proprietary files
 $(call inherit-product, vendor/xiaomi/sm6375-common/sm6375-common-vendor.mk)
diff --git a/sepolicy/vendor/file_contexts b/sepolicy/vendor/file_contexts
index dc219f6..b96a9ba 100644
--- a/sepolicy/vendor/file_contexts
+++ b/sepolicy/vendor/file_contexts
@@ -1,2 +1,5 @@
 # Sensors
 /vendor/bin/hw/android\.hardware\.sensors@2.1-service\.xiaomi_holi-multihal			u:object_r:hal_sensors_default_exec:s0
+
+# Vibrator
+/vendor/bin/hw/vendor\.qti\.hardware\.vibrator\.service\.xiaomi_holi				u:object_r:hal_vibrator_default_exec:s0
diff --git a/vibrator/Android.bp b/vibrator/Android.bp
index ff62eb6..7e401af 100644
--- a/vibrator/Android.bp
+++ b/vibrator/Android.bp
@@ -2,7 +2,7 @@ Common_CFlags = ["-Wall"]
 Common_CFlags += ["-Werror"]
 
 cc_library_shared {
-    name: "vendor.qti.hardware.vibrator.impl",
+    name: "vendor.qti.hardware.vibrator.impl.xiaomi_holi",
     vendor: true,
     cflags: Common_CFlags,
     srcs: [
@@ -20,12 +20,12 @@ cc_library_shared {
 }
 
 cc_binary {
-    name: "vendor.qti.hardware.vibrator.service",
+    name: "vendor.qti.hardware.vibrator.service.xiaomi_holi",
     vendor: true,
     relative_install_path: "hw",
-    init_rc: ["vendor.qti.hardware.vibrator.service.rc"],
+    init_rc: ["vendor.qti.hardware.vibrator.service.xiaomi_holi.rc"],
     vintf_fragments: [
-        "vendor.qti.hardware.vibrator.service.xml",
+        "vendor.qti.hardware.vibrator.service.xiaomi_holi.xml",
     ],
     cflags: Common_CFlags,
     srcs: [
@@ -37,6 +37,6 @@ cc_binary {
         "libbase",
         "libbinder_ndk",
         "android.hardware.vibrator-ndk_platform",
-        "vendor.qti.hardware.vibrator.impl",
+        "vendor.qti.hardware.vibrator.impl.xiaomi_holi",
     ],
 }
diff --git a/vibrator/Vibrator.cpp b/vibrator/Vibrator.cpp
index c7df267..1984eb1 100644
--- a/vibrator/Vibrator.cpp
+++ b/vibrator/Vibrator.cpp
@@ -27,7 +27,7 @@
  * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#define LOG_TAG "vendor.qti.vibrator"
+#define LOG_TAG "vendor.qti.vibrator.xiaomi_holi"
 
 #include <cutils/properties.h>
 #include <dirent.h>
diff --git a/vibrator/service.cpp b/vibrator/service.cpp
index 4fe3118..ff9706d 100644
--- a/vibrator/service.cpp
+++ b/vibrator/service.cpp
@@ -27,7 +27,7 @@
  * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#define LOG_TAG "vendor.qti.hardware.vibrator.service"
+#define LOG_TAG "vendor.qti.hardware.vibrator.service.xiaomi_holi"
 
 #include <android-base/logging.h>
 #include <android/binder_manager.h>
diff --git a/vibrator/vendor.qti.hardware.vibrator.service.rc b/vibrator/vendor.qti.hardware.vibrator.service.rc
deleted file mode 100644
index ffa8ce9..0000000
--- a/vibrator/vendor.qti.hardware.vibrator.service.rc
+++ /dev/null
@@ -1,4 +0,0 @@
-service vendor.qti.vibrator /vendor/bin/hw/vendor.qti.hardware.vibrator.service
-    class hal
-    user system
-    group system input
diff --git a/vibrator/vendor.qti.hardware.vibrator.service.xiaomi_holi.rc b/vibrator/vendor.qti.hardware.vibrator.service.xiaomi_holi.rc
new file mode 100644
index 0000000..1293483
--- /dev/null
+++ b/vibrator/vendor.qti.hardware.vibrator.service.xiaomi_holi.rc
@@ -0,0 +1,4 @@
+service vendor.qti.vibrator.xiaomi_holi /vendor/bin/hw/vendor.qti.hardware.vibrator.service.xiaomi_holi
+    class hal
+    user system
+    group system input
diff --git a/vibrator/vendor.qti.hardware.vibrator.service.xml b/vibrator/vendor.qti.hardware.vibrator.service.xiaomi_holi.xml
similarity index 100%
rename from vibrator/vendor.qti.hardware.vibrator.service.xml
rename to vibrator/vendor.qti.hardware.vibrator.service.xiaomi_holi.xml