Skip to content

Commit 7057a9f

Browse files
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) Merged-In: I091f57de9570b0ace3a8da76f16fe0e83f0aa624 Change-Id: I091f57de9570b0ace3a8da76f16fe0e83f0aa624
1 parent 4521fbf commit 7057a9f

1 file changed

Lines changed: 2 additions & 5 deletions

File tree

libs/sensor/SensorManager.cpp

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -172,11 +172,8 @@ status_t SensorManager::assertStateLocked() {
172172

173173
mSensors = mSensorServer->getSensorList(mOpPackageName);
174174
size_t count = mSensors.size();
175-
if (count == 0) {
176-
ALOGE("Failed to get Sensor list");
177-
mSensorServer.clear();
178-
return UNKNOWN_ERROR;
179-
}
175+
// If count is 0, mSensorList will be non-null. This is old
176+
// existing behavior and callers expect this.
180177
mSensorList =
181178
static_cast<Sensor const**>(malloc(count * sizeof(Sensor*)));
182179
LOG_ALWAYS_FATAL_IF(mSensorList == nullptr, "mSensorList NULL");

0 commit comments

Comments
 (0)