Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bea1db57 authored by Aravind Akella's avatar Aravind Akella Committed by Android Git Automerger
Browse files

am 71e351d9: Merge "Revert "Fix sockfd leakage in SensorService. Remove sockfd... 

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

* commit '71e351d9':
  Revert "Fix sockfd leakage in SensorService. Remove sockfd from Looper  when the connection is removed from mActiveConnections."
parents cfbc3654 71e351d9

services/sensorservice/SensorService.cpp

+0 −2
Original line number Diff line number Diff line
@@ -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