summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Rocky Fang <rockyfang@google.com> 2024-10-11 22:41:53 +0000
committer Rocky Fang <rockyfang@google.com> 2024-10-11 22:45:27 +0000
commitf66a6d011bdc8dfbcdd6139ad10955af408837fb (patch)
treee2239f9122edd4b0264145637e726bce441ba321
parentfbf5a5bd50458e284a141867d344938ee7f5b40c (diff)
Align enable with createSensorEventConnection
This is needed since without this, a package might not be able to reregister a sensor after creating it. Bug: 366422218 Test: Tested by reporter using the method described in the bug Flag: EXEMPT bugfix Change-Id: I38a3d84a3d2a9793c8659ed7ac73d0a13eeccafc
-rw-r--r--services/sensorservice/SensorService.cpp7
1 files changed, 4 insertions, 3 deletions
diff --git a/services/sensorservice/SensorService.cpp b/services/sensorservice/SensorService.cpp
index 060508ca25..eabbb3977c 100644
--- a/services/sensorservice/SensorService.cpp
+++ b/services/sensorservice/SensorService.cpp
@@ -2049,9 +2049,10 @@ status_t SensorService::enable(const sp<SensorEventConnection>& connection,
}
ConnectionSafeAutolock connLock = mConnectionHolder.lock(mLock);
- if (mCurrentOperatingMode != NORMAL && mCurrentOperatingMode != REPLAY_DATA_INJECTION &&
- !isAllowListedPackage(connection->getPackageName())) {
- return INVALID_OPERATION;
+ if (mCurrentOperatingMode != NORMAL &&
+ !isInjectionMode(mCurrentOperatingMode) &&
+ !isAllowListedPackage(connection->getPackageName())) {
+ return INVALID_OPERATION;
}
SensorRecord* rec = mActiveSensors.valueFor(handle);