commit | 174c5b8ecdc52263832d7f8fa0ae1a22f8a91dcc | [log] [tgz] |
---|---|---|
author | Devin Moore <devinmoore@google.com> | Tue Apr 25 00:17:13 2023 +0000 |
committer | Prashantsinh Parmar <prashantsinh.parmar@fairphone.partners> | Mon Oct 09 23:26:31 2023 +0530 |
tree | 55c1db9fb7c3cb2fcdb90a6aee6cc77cabce97d7 | |
parent | 03b77e7b380e529dd2d9d851ca847a11f6f3db52 [diff] |
Allow sensors list to be empty Test: atest VtsHalSensorManagerV1_0TargetTest Bug: 278013275 Bug: 269014004 (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:49600b10aa5675d4e7e985203d69f252ead13e45) (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:7057a9f08d98bfec8ffbabcf00f2885d3909c6c9) Merged-In: I091f57de9570b0ace3a8da76f16fe0e83f0aa624 Change-Id: I091f57de9570b0ace3a8da76f16fe0e83f0aa624 Change-Id: Ic26601737184d3b07c374c1cb77628b61f80df9e
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");