From 49f1174e9c1be1f142a8fcefbe41cf84bb10c616 Mon Sep 17 00:00:00 2001
From: Sebastiano Barezzi <barezzisebastiano@gmail.com>
Date: Mon, 7 Jun 2021 17:28:14 +0200
Subject: [PATCH] sm8250-common: Switch to AOSP light HIDL

* QTI light AIDL is just the AIDL version of the default light HIDL

Change-Id: I2d88cf7dd2aadcbfee4af7b0dae99e7facef80c1
---
 kona.mk               |  4 ++++
 manifest.xml          | 10 ++++++++++
 proprietary-files.txt |  5 -----
 3 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/kona.mk b/kona.mk
index d2ddd8e..776ad01 100644
--- a/kona.mk
+++ b/kona.mk
@@ -234,6 +234,10 @@ PRODUCT_PACKAGES += \
     liboffloadhal
 
 # Lights
+PRODUCT_PACKAGES += \
+    android.hardware.light@2.0-impl \
+    android.hardware.light@2.0-service
+
 PRODUCT_PACKAGES += \
     lights.kona
 
diff --git a/manifest.xml b/manifest.xml
index 3bd450f..d9f324c 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -106,6 +106,16 @@
         </interface>
         <fqname>@4.0::IKeymasterDevice/default</fqname>
     </hal>
+    <hal format="hidl">
+        <name>android.hardware.light</name>
+        <transport>hwbinder</transport>
+        <version>2.0</version>
+        <interface>
+            <name>ILight</name>
+            <instance>default</instance>
+        </interface>
+        <fqname>@2.0::ILight/default</fqname>
+    </hal>
     <hal format="hidl">
         <name>android.hardware.media.omx</name>
         <transport>hwbinder</transport>
diff --git a/proprietary-files.txt b/proprietary-files.txt
index f3ae775..25e2a33 100644
--- a/proprietary-files.txt
+++ b/proprietary-files.txt
@@ -453,11 +453,6 @@ vendor/lib64/libkeymasterprovision.so
 vendor/lib64/libkeymasterutils.so
 vendor/lib64/libqtikeymaster4.so
 
-# Lights
-vendor/bin/hw/android.hardware.lights-service.qti
-vendor/etc/init/android.hardware.lights-qti.rc
--vendor/etc/vintf/manifest/android.hardware.lights-qti.xml
-
 # Listen
 vendor/lib/hw/sound_trigger.primary.kona.so
 vendor/lib/libadpcmdec.so