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

Commit 722ee6fe 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: 4d99bf3a

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



Change-Id: Id6ad2abf1c9ccf588438a238c2954d63eb767f9f
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents e5592863 4d99bf3a

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;