diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-09-01 12:08:21 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-09-01 12:08:21 +0000 |
| commit | bbecd0a328c1158a2cda81fa992967623549fcc6 (patch) | |
| tree | 97ef1e25705eb3f9f1d1264f8488277ade077e73 | |
| parent | d6b05b5758e82f399ed7baeec811e476c74e1a2f (diff) | |
| parent | 17a6009208f18d95fa15c4ae5dfb6e611104e8fe (diff) | |
| download | native-android13-qpr3-s12-release.tar.gz | |
Merge cherrypicks of ['googleplex-android-review.googlesource.com/23677155'] into tm-qpr3-release.android-13.0.0_r79android-13.0.0_r78android-13.0.0_r77android-13.0.0_r76android-13.0.0_r75android13-qpr3-s13-releaseandroid13-qpr3-s12-releaseandroid13-qpr3-s11-releaseandroid13-qpr3-s10-releaseandroid13-qpr3-release
Change-Id: I509fa36c23d287f6ae7b4c6d65e75ffa8ab96b47
| -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"); |