Merge "Only check noteOp in SensorService if AppOp >= 0" into qt-dev
diff --git a/services/sensorservice/SensorService.cpp b/services/sensorservice/SensorService.cpp
index fa1e232..c11b88e 100644
--- a/services/sensorservice/SensorService.cpp
+++ b/services/sensorservice/SensorService.cpp
@@ -1550,7 +1550,8 @@
if (err == NO_ERROR) {
connection->updateLooperRegistration(mLooper);
- if (sensor->getSensor().getRequiredPermission().size() > 0) {
+ if (sensor->getSensor().getRequiredPermission().size() > 0 &&
+ sensor->getSensor().getRequiredAppOp() >= 0) {
connection->mHandleToAppOp[handle] = sensor->getSensor().getRequiredAppOp();
}