commit 02c0482d771f4b2b7e9580e37e6a2923d851945d
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Tue Aug 01 16:58:33 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Aug 01 16:58:33 2023 +0000
tree 07018f0480a40a0ba28e3b79cb4a671d9627259b
parent ca9fc2e8df7cbb19e462bdaadbc3cb98ec5b2fb7
parent 099be40eae8d08811b0f292c6e0d38a1dcf90000

Merge "Allow sensors list to be empty" into main am: 099be40eae

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

Change-Id: Ie738a9fc5e5b45608260be8bfac98967692729c9
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 40061cd..9f814f1 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");