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

* commit 'b17044adcf951b66ce2ecb7f7835572d7448bd64':
  Revert "Fix sockfd leakage in SensorService. Remove sockfd from Looper  when the connection is removed from mActiveConnections."
This commit is contained in:
Aravind Akella 2014-09-29 19:45:08 +00:00 committed by Android Git Automerger
commit f7ebef9890

View File

@ -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