commit 2d704043f3f41bad47b91e4e31f80b336a01f16d
author Devin Moore <devinmoore@google.com> Wed Apr 26 18:52:34 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Apr 26 18:52:34 2023 +0000
tree 9efbf4fbdb298db6bdaec42a793f4a065beabc42
parent 78cdd99d5616ed9d5e4f3c09c17a6430aef2443c
parent 9895dfe44bf51f5ee1a36d646611292d0e36f92e

Merge "Allow sensors list to be empty" into udc-dev am: 9895dfe44b

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/22831942

Change-Id: I5b1792415224b194937f237e785fc37cecf3f02b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

libs/sensor/SensorManager.cpp

diff --git a/libs/sensor/SensorManager.cpp b/libs/sensor/SensorManager.cpp
index ba190e0..980f8d1 100644
--- a/libs/sensor/SensorManager.cpp
+++ b/libs/sensor/SensorManager.cpp
@@ -176,11 +176,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");