summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVladimir Komsiyski <vladokom@google.com>2023-07-28 07:13:46 +0000
committerAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2023-09-15 21:19:25 +0000
commitee1e75e16dc6feedec11823f1cd0f6222d331256 (patch)
tree6f3c8860b827864587e0d3b5342ef102b1b5a9af
parent1bb095c98715f6e34ffd8ab8c4b6721a007f8098 (diff)
downloadnative-ee1e75e16dc6feedec11823f1cd0f6222d331256.tar.gz
Revert "Handle runtime sensor events even if there are no real ones."
This reverts commit 3b9574a68afb242d573f062ce8e0a99a452d5842. Reason for revert: potential culprit for b/291461814 Bug: 291461814 Test: m (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:e9cb5b159c6bf1c76576845d4bacd752ce79f8e1) Merged-In: Ib92a05135a05978d8d4e6a938df1c6fb5b8169e2 Change-Id: Ib92a05135a05978d8d4e6a938df1c6fb5b8169e2
-rw-r--r--services/sensorservice/SensorService.cpp7
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;