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
diff --git a/services/sensorservice/SensorEventConnection.cpp b/services/sensorservice/SensorEventConnection.cpp
index b66cbcf..c4cfdc6 100644
--- a/services/sensorservice/SensorEventConnection.cpp
+++ b/services/sensorservice/SensorEventConnection.cpp
@@ -78,7 +78,14 @@
void SensorService::SensorEventConnection::dump(String8& result) {
Mutex::Autolock _l(mConnectionLock);
- result.appendFormat("\tOperating Mode: %s\n",mDataInjectionMode ? "DATA_INJECTION" : "NORMAL");
+ result.appendFormat("\tOperating Mode: ");
+ if (!mService->isWhiteListedPackage(getPackageName())) {
+ result.append("RESTRICTED\n");
+ } else if (mDataInjectionMode) {
+ result.append("DATA_INJECTION\n");
+ } else {
+ result.append("NORMAL\n");
+ }
result.appendFormat("\t %s | WakeLockRefCount %d | uid %d | cache size %d | "
"max cache size %d\n", mPackageName.string(), mWakeLockRefCount, mUid, mCacheSize,
mMaxCacheSize);