From 993b723e0b2396b2f264fe46c9e1fb48dcde1630 Mon Sep 17 00:00:00 2001
From: "Kevin F. Haggerty" <haggertk@lineageos.org>
Date: Mon, 26 Feb 2018 06:28:32 -0700
Subject: [PATCH] Revert "Revert "msm8974-common: Use QTI HIDL power HAL""

This reverts commit 24d70a1aec4a579168c5ad8b17889f8f9b28fe8a.

* The new HIDL power HAL seems to be appropriately riced^Wfixed for
  8974 now.

Change-Id: I629ab2314dec4698a0d4d45d77cdc48bf92a4d74
---
 BoardConfigCommon.mk | 5 +++++
 manifest.xml         | 2 +-
 msm8974.mk           | 3 +--
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk
index 7ad52ed..12c8953 100644
--- a/BoardConfigCommon.mk
+++ b/BoardConfigCommon.mk
@@ -77,6 +77,11 @@ include device/samsung/msm8974-common/sepolicy/sepolicy.mk
 TARGET_INIT_VENDOR_LIB := libinit_msm8974
 TARGET_RECOVERY_DEVICE_MODULES := libinit_msm8974
 
+# Power
+TARGET_HAS_LEGACY_POWER_STATS := true
+TARGET_HAS_NO_WIFI_STATS := true
+TARGET_USES_INTERACTION_BOOST := true
+
 # Time services
 BOARD_USES_QC_TIME_SERVICES := true
 
diff --git a/manifest.xml b/manifest.xml
index d38a208..fdffd97 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -116,7 +116,7 @@
     </hal>
     <hal format="hidl">
         <name>android.hardware.power</name>
-        <transport arch="32">passthrough</transport>
+        <transport>hwbinder</transport>
         <version>1.0</version>
         <interface>
             <name>IPower</name>
diff --git a/msm8974.mk b/msm8974.mk
index 166ed63..9ad50d0 100644
--- a/msm8974.mk
+++ b/msm8974.mk
@@ -149,8 +149,7 @@ PRODUCT_PACKAGES += \
 
 # Power HAL
 PRODUCT_PACKAGES += \
-    android.hardware.power@1.0-impl \
-    power.msm8974
+    android.hardware.power@1.0-service-qti
 
 # RenderScript HAL
 PRODUCT_PACKAGES += \