| commit | 9b981f945001ecf6c44e5c44aefbbac51e487557 | [log] [tgz] |
|---|---|---|
| author | Marvin Ramin <marvinramin@google.com> | Wed Sep 13 13:53:29 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Sep 13 13:53:29 2023 +0000 |
| tree | 54a46bad2907ae5f32aec9548a4027b4e1634389 | |
| parent | b19f33760072f29110999edc05861744bd69e782 [diff] | |
| parent | e124fbbc5827beb2606c1763288ee266dc1d65f9 [diff] |
Merge "Revert "Handle runtime sensor events even if there are no real ones."" into udc-dev am: 5636b18792 am: e124fbbc58 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/24240403 Change-Id: Iaebe9012e3b46f83dd8580f36da1b2ccfaba045e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/services/sensorservice/SensorService.cpp b/services/sensorservice/SensorService.cpp index 193847b..ad0ed4a 100644 --- a/services/sensorservice/SensorService.cpp +++ b/services/sensorservice/SensorService.cpp
@@ -1055,12 +1055,7 @@ 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;