Merge cherrypicks of ['googleplex-android-review.googlesource.com/23677152'] into sc-v2-platform-release.android-platform-12.1.0_r19

Change-Id: I38cad9a6135f313a67dbe06ce57d95f6a11f0dcd

1 files changed, 2 insertions, 5 deletions

diff --git a/libs/sensor/SensorManager.cpp b/libs/sensor/SensorManager.cpp
index cc5bcd8422..4e4bdcfb76 100644
--- a/libs/sensor/SensorManager.cpp
+++ b/libs/sensor/SensorManager.cpp
@@ -172,11 +172,8 @@ status_t SensorManager::assertStateLocked() {
 
         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");