commit 5636b1879241ad1b896ea04cf3fea2b2f15a7461
author Marvin Ramin <marvinramin@google.com> Wed Sep 13 11:53:38 2023 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Sep 13 11:53:38 2023 +0000
tree b6b14200e3005f0f70c67595861596a55d246e09
parent a0c7cca5769008d02e0ce227feb3efd7471813a4
parent e9cb5b159c6bf1c76576845d4bacd752ce79f8e1

Merge "Revert "Handle runtime sensor events even if there are no real ones."" into udc-dev

services/sensorservice/SensorService.cpp

diff --git a/services/sensorservice/SensorService.cpp b/services/sensorservice/SensorService.cpp
index 90d7541..398d602 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;