commit bea1db57deb3488fe3eb8c3f74ed05c64a5710bf
author Aravind Akella <aakella@google.com> Sat Sep 27 02:46:32 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Sat Sep 27 02:46:32 2014 +0000
tree 3db20dc75d183a759e1a217bd069d20ef1c5739e
parent cfbc36544e8856d49d86f61de1a0815ceef4d395
parent 71e351d96b551ccdbc39b52a0c66da86cae83701

am 71e351d9: Merge "Revert "Fix sockfd leakage in SensorService. Remove sockfd from Looper  when the connection is removed from mActiveConnections."" into lmp-dev

* commit '71e351d96b551ccdbc39b52a0c66da86cae83701':
  Revert "Fix sockfd leakage in SensorService. Remove sockfd from Looper  when the connection is removed from mActiveConnections."

services/sensorservice/SensorService.cpp

diff --git a/services/sensorservice/SensorService.cpp b/services/sensorservice/SensorService.cpp
index 77ada40..f953a96 100644
--- a/services/sensorservice/SensorService.cpp
+++ b/services/sensorservice/SensorService.cpp
@@ -653,7 +653,6 @@
             i++;
         }
     }
-    mLooper->removeFd(c->getSensorChannel()->getSendFd());
     mActiveConnections.remove(connection);
     BatteryService::cleanup(c->getUid());
     if (c->needsWakeLock()) {
@@ -800,7 +799,6 @@
             BatteryService::disableSensor(connection->getUid(), handle);
         }
         if (connection->hasAnySensor() == false) {
-            mLooper->removeFd(connection->getSensorChannel()->getSendFd());
             mActiveConnections.remove(connection);
         }
         // see if this sensor becomes inactive