commit 3cdccc6f852be345c43bdfbc2466aa17c1173c9c
author Mathias Agopian <mathias@google.com> Tue Sep 18 23:33:20 2012 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Tue Sep 18 23:33:20 2012 -0700
tree de24959284e897fb91a937bc9f376147fa09ae8a
parent 2398bc67bb04e9f087fd46455bf8ff1ce4eb510f
parent a5b8e8bfa9f3416ce61ee08162fb139afde60488

Merge "fix a typo in SensorService" into jb-mr1-dev

services/sensorservice/SensorService.cpp

diff --git a/services/sensorservice/SensorService.cpp b/services/sensorservice/SensorService.cpp
index 7ab34c9..c9b0f7c 100644
--- a/services/sensorservice/SensorService.cpp
+++ b/services/sensorservice/SensorService.cpp
@@ -462,6 +462,9 @@
                 if (mActiveConnections.indexOf(connection) < 0) {
                     mActiveConnections.add(connection);
                 }
+            } else {
+                ALOGW("sensor %08x already enabled in connection %p (ignoring)",
+                        handle, connection.get());
             }
         }
     }
@@ -567,7 +570,7 @@
 
 bool SensorService::SensorEventConnection::addSensor(int32_t handle) {
     Mutex::Autolock _l(mConnectionLock);
-    if (mSensorInfo.indexOf(handle) <= 0) {
+    if (mSensorInfo.indexOf(handle) < 0) {
         mSensorInfo.add(handle);
         return true;
     }