diff options
| author | Marvin Ramin <marvinramin@google.com> | 2023-09-13 12:57:08 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-09-13 12:57:08 +0000 |
| commit | 93eac2ac4daeb99e09e9a7240c6b2c60ee20d056 (patch) | |
| tree | 45054eaac0b9102a5494d47cdf1810f497deaff0 | |
| parent | 37d7a6fd0287f5b6dfabcee31348d63e18ec1db5 (diff) | |
| parent | 5636b1879241ad1b896ea04cf3fea2b2f15a7461 (diff) | |
| download | native-93eac2ac4daeb99e09e9a7240c6b2c60ee20d056.tar.gz | |
Merge "Revert "Handle runtime sensor events even if there are no real ones."" into udc-dev am: 5636b18792
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/24240403
Change-Id: I8e664f1a64369b18618f275bb84387dab4ec3294
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | services/sensorservice/SensorService.cpp | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/services/sensorservice/SensorService.cpp b/services/sensorservice/SensorService.cpp index 90d75414d6..398d60242b 100644 --- a/services/sensorservice/SensorService.cpp +++ b/services/sensorservice/SensorService.cpp @@ -1055,12 +1055,7 @@ bool SensorService::threadLoop() { if (count < 0) { if(count == DEAD_OBJECT && device.isReconnecting()) { device.reconnect(); - // There are no "real" events at this point, but do not skip the rest of the loop - // if there are pending runtime events. - Mutex::Autolock _l(&mLock); - if (mRuntimeSensorEventQueue.empty()) { - continue; - } + continue; } else { ALOGE("sensor poll failed (%s)", strerror(-count)); break; |