commit bce04d719d16ce5d3fa3c7e88d2c6418217f506c
author Brian Stack <bstack@google.com> Thu Mar 21 10:54:10 2019 -0700
committer Brian Stack <bstack@google.com> Thu Mar 21 11:09:14 2019 -0700
tree 5d6e3dc79be8a8d07637b12310b54fbdf539de9c
parent 3d694145126c794a1d47f4d05164756307a79cf8

Improve Sensor Service's dumpsys when restricted

Update the sensor service dumpsys to include restricted as a possible
operating mode for individual Sensor Event Connections. Do not print
sensors as active if all Sensor Event Connections requesting the
sensor are restricted.

Bug: 129007172
Test: Verified sensors only requested by restricted connections are
      not displayed as active in 'dumpsys sensorservice'
Test: Verified sensors that are part of a white listed sensor
      connection are displayed in 'dumpsys sensorservice' when Sensor
      Service is in restricted mode.
Test: Verified sensor event connections that are not white listed are
      marked as RESTRICTED when sensor service is in restricted mode
      and return to NORMAL when sensor service is returned to normal
      mode.
Change-Id: I3b12d6f802dbaddf682fa76af7fda5f9c3e5e870

services/sensorservice/SensorService.cpp

diff --git a/services/sensorservice/SensorService.cpp b/services/sensorservice/SensorService.cpp
index 9a37ff1..a8cb372 100644
--- a/services/sensorservice/SensorService.cpp
+++ b/services/sensorservice/SensorService.cpp
@@ -441,12 +441,15 @@
             }
 
             result.append("Active sensors:\n");
+            SensorDevice& dev = SensorDevice::getInstance();
             for (size_t i=0 ; i<mActiveSensors.size() ; i++) {
                 int handle = mActiveSensors.keyAt(i);
-                result.appendFormat("%s (handle=0x%08x, connections=%zu)\n",
-                        getSensorName(handle).string(),
-                        handle,
-                        mActiveSensors.valueAt(i)->getNumConnections());
+                if (dev.isSensorActive(handle)) {
+                    result.appendFormat("%s (handle=0x%08x, connections=%zu)\n",
+                            getSensorName(handle).string(),
+                            handle,
+                            mActiveSensors.valueAt(i)->getNumConnections());
+                }
             }
 
             result.appendFormat("Socket Buffer size = %zd events\n",