commit 678f4fce90b5ed2794007cc8c63fce0c1b962404
author Aravind Akella <aakella@google.com> Sat Sep 27 02:06:32 2014 +0000
committer Aravind Akella <aakella@google.com> Sat Sep 27 02:06:32 2014 +0000
tree 62fc4fea471bc3abce1c243e160aa79f4018a133
parent 5105960d49bfa86efeeea8f87c87aa96b5771c37

Revert "Fix sockfd leakage in SensorService. Remove sockfd from Looper  when the connection is removed from mActiveConnections."

This reverts commit 5105960d49bfa86efeeea8f87c87aa96b5771c37.

Change-Id: I4d39ded2e50ef8a8e0aac27e438876203385a1f0

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