commit c8ad44b43504d9d985c3ff6185d53f4e6fac5ff8
author Arthur Ishiguro <arthuri@google.com> Mon Apr 13 08:04:47 2020 -0700
committer Arthur Ishiguro <arthuri@google.com> Tue Apr 14 11:29:13 2020 -0700
tree a92da922a09d97a8f38eeb650ca164b356616756
parent fb64fca3da4633a0fc96c41da2a6622f3875532c

Revert "Extend background app behavior for direct channel"

This reverts commit 14c96b1019ef961e23ec972e0c8756039b58cf45.

Bug: 74395023
Test: Revert

Change-Id: I8f41272ce8b26fa72724c6b2cf0c50b9953ee4a4

services/sensorservice/SensorService.cpp

diff --git a/services/sensorservice/SensorService.cpp b/services/sensorservice/SensorService.cpp
index 86ab0f8..9ed6fc2 100644
--- a/services/sensorservice/SensorService.cpp
+++ b/services/sensorservice/SensorService.cpp
@@ -302,7 +302,6 @@
 void SensorService::setSensorAccess(uid_t uid, bool hasAccess) {
     ConnectionSafeAutolock connLock = mConnectionHolder.lock(mLock);
     const auto& connections = connLock.getActiveConnections();
-    const auto& directConnections = connLock.getDirectConnections();
 
     mLock.unlock();
     for (const sp<SensorEventConnection>& conn : connections) {
@@ -310,12 +309,6 @@
             conn->setSensorAccess(hasAccess);
         }
     }
-
-    for (const sp<SensorDirectConnection>& conn : directConnections) {
-        if (conn->getUid() == uid) {
-            conn->setSensorAccess(hasAccess);
-        }
-    }
 }
 
 const Sensor& SensorService::registerSensor(SensorInterface* s, bool isDebug, bool isVirtual) {
@@ -652,7 +645,7 @@
         connection->updateSensorSubscriptions();
     }
     for (const sp<SensorDirectConnection>& connection : connLock->getDirectConnections()) {
-        connection->updateSensorSubscriptions();
+        connection->stopAll(true /* backupRecord */);
     }
     dev.disableAllSensors();
     // Clear all pending flush connections for all active sensors. If one of the active
@@ -683,7 +676,7 @@
         connection->updateSensorSubscriptions();
     }
     for (const sp<SensorDirectConnection>& connection : connLock->getDirectConnections()) {
-        connection->updateSensorSubscriptions();
+        connection->recoverAll();
     }
 }