From 678f4fce90b5ed2794007cc8c63fce0c1b962404 Mon Sep 17 00:00:00 2001
From: Aravind Akella <aakella@google.com>
Date: Sat, 27 Sep 2014 02:06:32 +0000
Subject: [PATCH] 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 | 2 --
 1 file changed, 2 deletions(-)

diff --git a/services/sensorservice/SensorService.cpp b/services/sensorservice/SensorService.cpp
index 77ada40de..f953a960a 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