diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-08-18 06:14:43 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-08-18 06:14:43 +0000 |
| commit | 1e7d718c35cd5971f39f8025a266ce9a8db76220 (patch) | |
| tree | 50beb58d871d038f4b63e37a7292e15cf1f9ba3e | |
| parent | 59aa8174143199a41617b65e4e8c6be4b7a6ee26 (diff) | |
| parent | fc86b6f94a525137ecf3379609dbcf624d4ba491 (diff) | |
Snap for 10678424 from fc86b6f94a525137ecf3379609dbcf624d4ba491 to t-keystone-qcom-release
Change-Id: Id782efcdf4a55f88f43cbcd5ceaee05b60e97a80
| -rw-r--r-- | libs/sensor/SensorManager.cpp | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/libs/sensor/SensorManager.cpp b/libs/sensor/SensorManager.cpp index 40061cde61..9f814f1c48 100644 --- a/libs/sensor/SensorManager.cpp +++ b/libs/sensor/SensorManager.cpp @@ -176,11 +176,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"); |