diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-09-01 13:38:28 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-09-01 13:38:28 +0000 |
| commit | 938b812be602db8d4424aa383ac9e4595ae4ab7b (patch) | |
| tree | d8ed5f5ccf529e20388527a27b0755a854a66ec0 | |
| parent | ee3935f4c64d58f9f87ff6fac875cdad42f46038 (diff) | |
| parent | f86947d85866b699b703cf0e6dda9c5f4e24b0fa (diff) | |
| download | native-android13-qpr3-c-s12-release.tar.gz | |
Merge cherrypicks of ['googleplex-android-review.googlesource.com/23677155'] into tm-qpr3-c-release.android-13.0.0_r82android-13.0.0_r81android-13.0.0_r80android13-qpr3-c-s12-releaseandroid13-qpr3-c-s11-releaseandroid13-qpr3-c-s10-release
Change-Id: I058cda622bd5fd59ce2fb96a4fc29722275e8682
| -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"); |