commit 91c1ddbe36d82defa8f9122fa890616301063e9d
author Prashantsinh Parmar <prashantsinh.parmar@fairphone.partners> Tue Oct 10 15:11:12 2023 +0530
committer Prashantsinh Parmar <prashantsinh.parmar@fairphone.partners> Wed Oct 11 13:11:02 2023 +0200
tree 7599497203a35ccd4e8c9987421a2b7b2d2f338f
parent 1a5a812e73b01dfe852159a31f83295c2957e8ab
parent 174c5b8ecdc52263832d7f8fa0ae1a22f8a91dcc

Merge branch 'dev/11/fp3/security-aosp-rvc-release' into int/11/fp3

* dev/11/fp3/security-aosp-rvc-release:
  Allow sensors list to be empty

Change-Id: Icc61f345f514ade0580dad7d06cdf60d071664b5

libs/sensor/SensorManager.cpp

diff --git a/libs/sensor/SensorManager.cpp b/libs/sensor/SensorManager.cpp
index f5dd36a..22adc93 100644
--- a/libs/sensor/SensorManager.cpp
+++ b/libs/sensor/SensorManager.cpp
@@ -172,11 +172,8 @@
 
         mSensors = mSensorServer->getSensorList(mOpPackageName);
         size_t count = mSensors.size();
-        if (count == 0) {
-            ALOGE("Failed to get Sensor list");
-            mSensorServer.clear();
-            return UNKNOWN_ERROR;
-        }
+        // If count is 0, mSensorList will be non-null. This is old
+        // existing behavior and callers expect this.
         mSensorList =
                 static_cast<Sensor const**>(malloc(count * sizeof(Sensor*)));
         LOG_ALWAYS_FATAL_IF(mSensorList == nullptr, "mSensorList NULL");