From 9df9caa266bc7a1dc6e3ad88ce9757ee80feb506 Mon Sep 17 00:00:00 2001
From: Michael Bestas <mkbestas@lineageos.org>
Date: Sun, 29 Sep 2019 21:06:22 +0300
Subject: [PATCH] power: Add -qti suffix to module name

* Prevent conflict with other HALs

Change-Id: Icf1216410db26c3bb811d7aedde03e6d2f87e3cc
Signed-off-by: Sebastiano Barezzi <barezzisebastiano@gmail.com>
---
 Android.mk                                                    | 4 ++--
 Power.cpp                                                     | 2 +-
 ....power-service.rc => android.hardware.power-service-qti.rc | 2 +-
 power-vendor-product.mk                                       | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)
 rename android.hardware.power-service.rc => android.hardware.power-service-qti.rc (94%)

diff --git a/Android.mk b/Android.mk
index c92cde7..a61b8fa 100644
--- a/Android.mk
+++ b/Android.mk
@@ -81,8 +81,8 @@ ifeq ($(TARGET_USES_INTERACTION_BOOST),true)
     LOCAL_CFLAGS += -DINTERACTION_BOOST
 endif
 
-LOCAL_MODULE := android.hardware.power-service
-LOCAL_INIT_RC := android.hardware.power-service.rc
+LOCAL_MODULE := android.hardware.power-service-qti
+LOCAL_INIT_RC := android.hardware.power-service-qti.rc
 LOCAL_MODULE_TAGS := optional
 LOCAL_CFLAGS += -Wno-unused-parameter -Wno-unused-variable
 LOCAL_VENDOR_MODULE := true
diff --git a/Power.cpp b/Power.cpp
index 0820013..617e265 100644
--- a/Power.cpp
+++ b/Power.cpp
@@ -31,7 +31,7 @@
  * SPDX-License-Identifier: BSD-3-Clause-Clear
  */
 
-#define LOG_TAG "QTI PowerHAL"
+#define LOG_TAG "android.hardware.power-service-qti"
 
 #include "Power.h"
 #include "PowerHintSession.h"
diff --git a/android.hardware.power-service.rc b/android.hardware.power-service-qti.rc
similarity index 94%
rename from android.hardware.power-service.rc
rename to android.hardware.power-service-qti.rc
index 7885506..05c4d33 100644
--- a/android.hardware.power-service.rc
+++ b/android.hardware.power-service-qti.rc
@@ -1,4 +1,4 @@
-service vendor.power /vendor/bin/hw/android.hardware.power-service
+service vendor.power /vendor/bin/hw/android.hardware.power-service-qti
     class hal
     user system
     group system
diff --git a/power-vendor-product.mk b/power-vendor-product.mk
index 59da33a..e008c74 100644
--- a/power-vendor-product.mk
+++ b/power-vendor-product.mk
@@ -1,5 +1,5 @@
 #Power product definitions
-PRODUCT_PACKAGES += android.hardware.power-service
+PRODUCT_PACKAGES += android.hardware.power-service-qti
 PRODUCT_PACKAGES += android.hardware.power-impl
 
 #Powerhint File