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

Commit 283173fe authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix sensor activate after SensorEventConnection removed" am: b51a9cc9... 

Merge "Fix sensor activate after SensorEventConnection removed" am: b51a9cc9 am: ce93621d am: 5673d11d

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib6f828cf2d9f30e2250279e1b93ae557ca041639
parents de822c77 5673d11d

services/sensorservice/SensorDevice.cpp

+2 −2
Original line number Diff line number Diff line
@@ -686,9 +686,9 @@ status_t SensorDevice::activateLocked(void* ident, int handle, int enabled) { 
        ALOGD_IF(DEBUG_CONNECTIONS, "enable index=%zd", info.batchParams.indexOfKey(ident));



        if (isClientDisabledLocked(ident)) {

            ALOGE("SensorDevice::activate, isClientDisabledLocked(%p):true, handle:%d",

            ALOGW("SensorDevice::activate, isClientDisabledLocked(%p):true, handle:%d",

                    ident, handle);

            return INVALID_OPERATION;

            return NO_ERROR;

        }



        if (info.batchParams.indexOfKey(ident) >= 0) {