commit 80c90e970e7f57c91feee265517df878f7c3ddbb
author Willi Ye <williye97@gmail.com> Sun Sep 08 18:23:04 2019 +0200
committer Jesse Chan <jc@lineageos.org> Fri May 15 22:15:57 2020 +0800
tree 3b144e4438cbdb90c80a0526631ab533f402fdf8
parent 834dfaa39b4b6e7cd3e3ae03a567235e6c4db976

sensors: map Samsung proximity sensor type to generic

Samsung uses their own com.samsung.sensor.physical_proximity
type instead of SENSOR_TYPE_PROXIMITY of Android.

This makes proximity sensor unavailable for us as we only
look for SENSOR_TYPE_PROXIMITY.

Thus, this change maps Samsung's vendor-specific proximity
sensor type to generic one.

Change-Id: I64f6558876e1398dfbea0e5c0eb76aa1aafd2dfd
Signed-off-by: Jesse Chan <jc@lineageos.org>

hidl/sensors/Sensors.cpp

diff --git a/hidl/sensors/Sensors.cpp b/hidl/sensors/Sensors.cpp
index a242e37..a1cd153 100644
--- a/hidl/sensors/Sensors.cpp
+++ b/hidl/sensors/Sensors.cpp
@@ -129,6 +129,12 @@
         if (dst->requiredPermission == "com.samsung.permission.SSENSOR") {
             dst->requiredPermission = "";
         }
+
+        if (dst->typeAsString == "com.samsung.sensor.physical_proximity") {
+            LOG(INFO) << "Fixing com.samsung.sensor.physical_proximity";
+            dst->type = SensorType::PROXIMITY;
+            dst->typeAsString = SENSOR_STRING_TYPE_PROXIMITY;
+        }
     }
 
     _hidl_cb(out);