Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 87cbe76c authored by Vladimir Komsiyski's avatar Vladimir Komsiyski Committed by Automerger Merge Worker
Browse files

Merge "Handle runtime sensor events even if there are no real ones." into... 

Merge "Handle runtime sensor events even if there are no real ones." into udc-dev am: 92745f7a am: ede64fc2

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/23658936



Change-Id: I92d9e3f4d38b2ac105782e95b83f590f80c60f9d
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents ed6c97e5 ede64fc2

services/sensorservice/SensorService.cpp

+6 −1
Original line number Diff line number Diff line
@@ -1055,7 +1055,12 @@ 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;

                }

            } else {

                ALOGE("sensor poll failed (%s)", strerror(-count));

                break;