summaryrefslogtreecommitdiffstats
path: root/services/sensorservice
diff options
context:
space:
mode:
authorAravind Akella <aakella@google.com>2014-09-27 02:06:32 +0000
committerAravind Akella <aakella@google.com>2014-09-27 02:06:32 +0000
commit678f4fce90b5ed2794007cc8c63fce0c1b962404 (patch)
tree62fc4fea471bc3abce1c243e160aa79f4018a133 /services/sensorservice
parent5105960d49bfa86efeeea8f87c87aa96b5771c37 (diff)
downloadframeworks_native-678f4fce90b5ed2794007cc8c63fce0c1b962404.zip
frameworks_native-678f4fce90b5ed2794007cc8c63fce0c1b962404.tar.gz
frameworks_native-678f4fce90b5ed2794007cc8c63fce0c1b962404.tar.bz2
Revert "Fix sockfd leakage in SensorService. Remove sockfd from Looper when the connection is removed from mActiveConnections."
This reverts commit 5105960d49bfa86efeeea8f87c87aa96b5771c37. Change-Id: I4d39ded2e50ef8a8e0aac27e438876203385a1f0
Diffstat (limited to 'services/sensorservice')
-rw-r--r--services/sensorservice/SensorService.cpp2
1 files changed, 0 insertions, 2 deletions
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 @@ void SensorService::cleanupConnection(SensorEventConnection* c)
i++;
}
}
- mLooper->removeFd(c->getSensorChannel()->getSendFd());
mActiveConnections.remove(connection);
BatteryService::cleanup(c->getUid());
if (c->needsWakeLock()) {
@@ -800,7 +799,6 @@ status_t SensorService::cleanupWithoutDisableLocked(
BatteryService::disableSensor(connection->getUid(), handle);
}
if (connection->hasAnySensor() == false) {
- mLooper->removeFd(connection->getSensorChannel()->getSendFd());
mActiveConnections.remove(connection);
}
// see if this sensor becomes inactive