From a7a4a3f4d8caf110aa109fa62a9ba5e8efcfdeb6 Mon Sep 17 00:00:00 2001
From: Rick Chen <rickctchen@google.com>
Date: Thu, 16 Apr 2020 15:32:39 +0800
Subject: [PATCH] sm6250-common: sensors: enable multihal 2.0

Bug: 152005392
Bug: 152727489
Test: Compile pass.
Change-Id: I9c059718a2529cd652360619797c22360ac213e2
Signed-off-by: Rick Chen <rickctchen@google.com>
---
 common.mk    |  3 +--
 manifest.xml | 10 ----------
 2 files changed, 1 insertion(+), 12 deletions(-)

diff --git a/common.mk b/common.mk
index b955b60..5c20a9e 100644
--- a/common.mk
+++ b/common.mk
@@ -305,8 +305,7 @@ PRODUCT_PACKAGES += \
 
 # Sensors
 PRODUCT_PACKAGES += \
-    android.hardware.sensors@1.0-impl \
-    android.hardware.sensors@1.0-service \
+    android.hardware.sensors@2.0-service.multihal \
     vendor.qti.hardware.display.mapper@1.1.vendor
 
 PRODUCT_COPY_FILES += \
diff --git a/manifest.xml b/manifest.xml
index 737609f..908417a 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -179,16 +179,6 @@
         </interface>
         <fqname>@1.0::IDevice/default</fqname>
     </hal>
-    <hal format="hidl">
-        <name>android.hardware.sensors</name>
-        <transport>hwbinder</transport>
-        <version>1.0</version>
-        <interface>
-            <name>ISensors</name>
-            <instance>default</instance>
-        </interface>
-        <fqname>@1.0::ISensors/default</fqname>
-    </hal>
     <hal format="hidl">
         <name>android.hardware.soundtrigger</name>
         <transport>hwbinder</transport>