commit 5105960d49bfa86efeeea8f87c87aa96b5771c37
author Aravind Akella <aakella@google.com> Tue Sep 23 16:42:49 2014 -0700
committer Aravind Akella <aakella@google.com> Tue Sep 23 23:46:22 2014 +0000
tree 7e13d628aa698194f87538c931b97c62b5612e5f
parent 12c4bdad7b2372ab64dcd2abbdbe47e709fb8b90

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

Bug: 17472228
Change-Id: Iaabe0968bd2104ef961ff5e8659bf91712e2e1db

services/sensorservice/SensorService.cpp

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