commit ce93621d5d9863f88c7a83912c83fb7442b235cd
author Treehugger Robot <treehugger-gerrit@google.com> Thu Mar 11 21:21:17 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Mar 11 21:21:17 2021 +0000
tree 880d4844b72d06f89f701d137be079ed4b0d09c2
parent 131370cf68558b371af0fc0c48b582533f53392a
parent b51a9cc926a8f49db6c2c65a47ec4ea7d72b510b

Merge "Fix sensor activate after SensorEventConnection removed" am: b51a9cc926

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id76c916a0fee0f17f58df45c3c3c9d02d566f4b0

services/sensorservice/SensorDevice.cpp

diff --git a/services/sensorservice/SensorDevice.cpp b/services/sensorservice/SensorDevice.cpp
index e355594..4d4cac5 100644
--- a/services/sensorservice/SensorDevice.cpp
+++ b/services/sensorservice/SensorDevice.cpp
@@ -689,9 +689,9 @@
         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) {