summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Treehugger Robot <treehugger-gerrit@google.com> 2021-03-11 20:34:27 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 2021-03-11 20:34:27 +0000
commitb51a9cc926a8f49db6c2c65a47ec4ea7d72b510b (patch)
tree880d4844b72d06f89f701d137be079ed4b0d09c2
parent682f459f94a65a5641c2e52303b515b089a96ab2 (diff)
parent94ae13178781a14867071636fded56c907a9db8b (diff)
Merge "Fix sensor activate after SensorEventConnection removed"
-rw-r--r--services/sensorservice/SensorDevice.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/services/sensorservice/SensorDevice.cpp b/services/sensorservice/SensorDevice.cpp
index e355594176..4d4cac568c 100644
--- a/services/sensorservice/SensorDevice.cpp
+++ b/services/sensorservice/SensorDevice.cpp
@@ -689,9 +689,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) {