Revert "Add stringType and requiredPermission to sensors, effectively adding permission checking for sensors"
This reverts commit c57a019e117117c5a76c772970b26cd0f5db8c6a.
Change-Id: I3540565bc3e56a32cf3b176a29216cf68bb763b2
diff --git a/include/android/sensor.h b/include/android/sensor.h
index b4e7ebe..129ea3e 100644
--- a/include/android/sensor.h
+++ b/include/android/sensor.h
@@ -281,28 +281,6 @@
*/
int ASensor_getMinDelay(ASensor const* sensor);
-/*
- * Returns the maximum size of batches for this sensor. Batches will often be
- * smaller, as the hardware fifo might be used for other sensors.
- */
-int ASensor_getFifoMaxEventCount(ASensor const* sensor);
-
-/*
- * Returns the hardware batch fifo size reserved to this sensor.
- */
-int ASensor_getFifoReservedEventCount(ASensor const* sensor);
-
-/*
- * Returns this sensor's string type.
- */
-const char* ASensor_getStringType(ASensor const* sensor);
-
-/*
- * Returns the permission required to see or access this sensor, or the
- * empty string if none is required.
- */
-const char* ASensor_getRequiredPermission(ASensor const* sensor);
-
#ifdef __cplusplus
};
diff --git a/include/gui/Sensor.h b/include/gui/Sensor.h
index 033b262..0c81426 100644
--- a/include/gui/Sensor.h
+++ b/include/gui/Sensor.h
@@ -69,8 +69,6 @@
int32_t getVersion() const;
int32_t getFifoReservedEventCount() const;
int32_t getFifoMaxEventCount() const;
- const String8& getStringType() const;
- const String8& getRequiredPermission() const;
// LightFlattenable protocol
inline bool isFixedSize() const { return false; }
@@ -91,10 +89,6 @@
int32_t mVersion;
int32_t mFifoReservedEventCount;
int32_t mFifoMaxEventCount;
- String8 mStringType;
- String8 mRequiredPermission;
- static void flattenString8(void*& buffer, size_t& size, const String8& string8);
- static bool unflattenString8(void const*& buffer, size_t& size, String8& outputString8);
};
// ----------------------------------------------------------------------------
diff --git a/libs/gui/Sensor.cpp b/libs/gui/Sensor.cpp
index 6f1a3f2..da6b0f9 100644
--- a/libs/gui/Sensor.cpp
+++ b/libs/gui/Sensor.cpp
@@ -48,90 +48,14 @@
mResolution = hwSensor->resolution;
mPower = hwSensor->power;
mMinDelay = hwSensor->minDelay;
-
// Set fifo event count zero for older devices which do not support batching. Fused
// sensors also have their fifo counts set to zero.
if (halVersion >= SENSORS_DEVICE_API_VERSION_1_1) {
mFifoReservedEventCount = hwSensor->fifoReservedEventCount;
mFifoMaxEventCount = hwSensor->fifoMaxEventCount;
- }
-
- // Ensure existing sensors have correct string type and required
- // permissions.
- switch (mType) {
- case SENSOR_TYPE_ACCELEROMETER:
- mStringType = SENSOR_STRING_TYPE_ACCELEROMETER;
- break;
- case SENSOR_TYPE_AMBIENT_TEMPERATURE:
- mStringType = SENSOR_STRING_TYPE_AMBIENT_TEMPERATURE;
- break;
- case SENSOR_TYPE_GAME_ROTATION_VECTOR:
- mStringType = SENSOR_STRING_TYPE_GAME_ROTATION_VECTOR;
- break;
- case SENSOR_TYPE_GEOMAGNETIC_ROTATION_VECTOR:
- mStringType = SENSOR_STRING_TYPE_GEOMAGNETIC_ROTATION_VECTOR;
- break;
- case SENSOR_TYPE_GRAVITY:
- mStringType = SENSOR_STRING_TYPE_GRAVITY;
- break;
- case SENSOR_TYPE_GYROSCOPE:
- mStringType = SENSOR_STRING_TYPE_GYROSCOPE;
- break;
- case SENSOR_TYPE_GYROSCOPE_UNCALIBRATED:
- mStringType = SENSOR_STRING_TYPE_GYROSCOPE_UNCALIBRATED;
- break;
- case SENSOR_TYPE_HEART_RATE:
- mStringType = SENSOR_STRING_TYPE_HEART_RATE;
- mRequiredPermission = SENSOR_PERMISSION_BODY_SENSORS;
- break;
- case SENSOR_TYPE_LIGHT:
- mStringType = SENSOR_STRING_TYPE_LIGHT;
- break;
- case SENSOR_TYPE_LINEAR_ACCELERATION:
- mStringType = SENSOR_STRING_TYPE_LINEAR_ACCELERATION;
- break;
- case SENSOR_TYPE_MAGNETIC_FIELD:
- mStringType = SENSOR_STRING_TYPE_MAGNETIC_FIELD;
- break;
- case SENSOR_TYPE_MAGNETIC_FIELD_UNCALIBRATED:
- mStringType = SENSOR_STRING_TYPE_MAGNETIC_FIELD_UNCALIBRATED;
- break;
- case SENSOR_TYPE_ORIENTATION:
- mStringType = SENSOR_STRING_TYPE_ORIENTATION;
- break;
- case SENSOR_TYPE_PRESSURE:
- mStringType = SENSOR_STRING_TYPE_PRESSURE;
- break;
- case SENSOR_TYPE_PROXIMITY:
- mStringType = SENSOR_STRING_TYPE_PROXIMITY;
- break;
- case SENSOR_TYPE_RELATIVE_HUMIDITY:
- mStringType = SENSOR_STRING_TYPE_RELATIVE_HUMIDITY;
- break;
- case SENSOR_TYPE_ROTATION_VECTOR:
- mStringType = SENSOR_STRING_TYPE_ROTATION_VECTOR;
- break;
- case SENSOR_TYPE_SIGNIFICANT_MOTION:
- mStringType = SENSOR_STRING_TYPE_SIGNIFICANT_MOTION;
- break;
- case SENSOR_TYPE_STEP_COUNTER:
- mStringType = SENSOR_STRING_TYPE_STEP_COUNTER;
- break;
- case SENSOR_TYPE_STEP_DETECTOR:
- mStringType = SENSOR_STRING_TYPE_STEP_DETECTOR;
- break;
- case SENSOR_TYPE_TEMPERATURE:
- mStringType = SENSOR_STRING_TYPE_TEMPERATURE;
- break;
- default:
- // Only pipe the stringType and requiredPermission for custom sensors.
- if (halVersion >= SENSORS_DEVICE_API_VERSION_1_2 && hwSensor->stringType) {
- mStringType = hwSensor->stringType;
- }
- if (halVersion >= SENSORS_DEVICE_API_VERSION_1_2 && hwSensor->requiredPermission) {
- mRequiredPermission = hwSensor->requiredPermission;
- }
- break;
+ } else {
+ mFifoReservedEventCount = 0;
+ mFifoMaxEventCount = 0;
}
}
@@ -191,14 +115,6 @@
return mFifoMaxEventCount;
}
-const String8& Sensor::getStringType() const {
- return mStringType;
-}
-
-const String8& Sensor::getRequiredPermission() const {
- return mRequiredPermission;
-}
-
size_t Sensor::getFlattenedSize() const
{
size_t fixedSize =
@@ -207,10 +123,8 @@
sizeof(int32_t) * 3;
size_t variableSize =
- sizeof(uint32_t) + FlattenableUtils::align<4>(mName.length()) +
- sizeof(uint32_t) + FlattenableUtils::align<4>(mVendor.length()) +
- sizeof(uint32_t) + FlattenableUtils::align<4>(mStringType.length()) +
- sizeof(uint32_t) + FlattenableUtils::align<4>(mRequiredPermission.length());
+ sizeof(int32_t) + FlattenableUtils::align<4>(mName.length()) +
+ sizeof(int32_t) + FlattenableUtils::align<4>(mVendor.length());
return fixedSize + variableSize;
}
@@ -220,8 +134,14 @@
return NO_MEMORY;
}
- flattenString8(buffer, size, mName);
- flattenString8(buffer, size, mVendor);
+ FlattenableUtils::write(buffer, size, mName.length());
+ memcpy(static_cast<char*>(buffer), mName.string(), mName.length());
+ FlattenableUtils::advance(buffer, size, FlattenableUtils::align<4>(mName.length()));
+
+ FlattenableUtils::write(buffer, size, mVendor.length());
+ memcpy(static_cast<char*>(buffer), mVendor.string(), mVendor.length());
+ FlattenableUtils::advance(buffer, size, FlattenableUtils::align<4>(mVendor.length()));
+
FlattenableUtils::write(buffer, size, mVersion);
FlattenableUtils::write(buffer, size, mHandle);
FlattenableUtils::write(buffer, size, mType);
@@ -232,23 +152,38 @@
FlattenableUtils::write(buffer, size, mMinDelay);
FlattenableUtils::write(buffer, size, mFifoReservedEventCount);
FlattenableUtils::write(buffer, size, mFifoMaxEventCount);
- flattenString8(buffer, size, mStringType);
- flattenString8(buffer, size, mRequiredPermission);
return NO_ERROR;
}
status_t Sensor::unflatten(void const* buffer, size_t size) {
- if (!unflattenString8(buffer, size, mName)) {
+ size_t len;
+
+ if (size < sizeof(size_t)) {
return NO_MEMORY;
}
- if (!unflattenString8(buffer, size, mVendor)) {
+ FlattenableUtils::read(buffer, size, len);
+ if (size < len) {
return NO_MEMORY;
}
+ mName.setTo(static_cast<char const*>(buffer), len);
+ FlattenableUtils::advance(buffer, size, FlattenableUtils::align<4>(len));
+
+
+ if (size < sizeof(size_t)) {
+ return NO_MEMORY;
+ }
+ FlattenableUtils::read(buffer, size, len);
+ if (size < len) {
+ return NO_MEMORY;
+ }
+ mVendor.setTo(static_cast<char const*>(buffer), len);
+ FlattenableUtils::advance(buffer, size, FlattenableUtils::align<4>(len));
size_t fixedSize =
sizeof(int32_t) * 3 +
sizeof(float) * 4 +
sizeof(int32_t) * 3;
+
if (size < fixedSize) {
return NO_MEMORY;
}
@@ -263,37 +198,8 @@
FlattenableUtils::read(buffer, size, mMinDelay);
FlattenableUtils::read(buffer, size, mFifoReservedEventCount);
FlattenableUtils::read(buffer, size, mFifoMaxEventCount);
-
- if (!unflattenString8(buffer, size, mStringType)) {
- return NO_MEMORY;
- }
- if (!unflattenString8(buffer, size, mRequiredPermission)) {
- return NO_MEMORY;
- }
return NO_ERROR;
}
-void Sensor::flattenString8(void*& buffer, size_t& size,
- const String8& string8) {
- uint32_t len = string8.length();
- FlattenableUtils::write(buffer, size, len);
- memcpy(static_cast<char*>(buffer), string8.string(), len);
- FlattenableUtils::advance(buffer, size, FlattenableUtils::align<4>(len));
-}
-
-bool Sensor::unflattenString8(void const*& buffer, size_t& size, String8& outputString8) {
- uint32_t len;
- if (size < sizeof(len)) {
- return false;
- }
- FlattenableUtils::read(buffer, size, len);
- if (size < len) {
- return false;
- }
- outputString8.setTo(static_cast<char const*>(buffer), len);
- FlattenableUtils::advance(buffer, size, FlattenableUtils::align<4>(len));
- return true;
-}
-
// ----------------------------------------------------------------------------
}; // namespace android
diff --git a/services/sensorservice/SensorService.cpp b/services/sensorservice/SensorService.cpp
index ca2fdf6..f6705f6 100644
--- a/services/sensorservice/SensorService.cpp
+++ b/services/sensorservice/SensorService.cpp
@@ -205,7 +205,7 @@
String8 result;
if (!PermissionCache::checkCallingPermission(sDump)) {
result.appendFormat("Permission Denial: "
- "can't dump SensorService from pid=%d, uid=%d\n",
+ "can't dump SurfaceFlinger from pid=%d, uid=%d\n",
IPCThreadState::self()->getCallingPid(),
IPCThreadState::self()->getCallingUid());
} else {
@@ -215,24 +215,21 @@
const Sensor& s(mSensorList[i]);
const sensors_event_t& e(mLastEventSeen.valueFor(s.getHandle()));
result.appendFormat(
- "%-48s| %-32s| %-48s| 0x%08x | \"%s\"\n\t",
+ "%-48s| %-32s | 0x%08x | ",
s.getName().string(),
s.getVendor().string(),
- s.getStringType().string(),
- s.getHandle(),
- s.getRequiredPermission().string());
+ s.getHandle());
if (s.getMinDelay() > 0) {
result.appendFormat(
- "maxRate=%7.2fHz | ", 1e6f / s.getMinDelay());
+ "maxRate=%7.2fHz | ", 1e6f / s.getMinDelay());
} else {
result.append(s.getMinDelay() == 0
? "on-demand | "
: "one-shot | ");
}
if (s.getFifoMaxEventCount() > 0) {
- result.appendFormat("FifoMax=%d events | ",
- s.getFifoMaxEventCount());
+ result.appendFormat("getFifoMaxEventCount=%d events | ", s.getFifoMaxEventCount());
} else {
result.append("no batching support | ");
}
@@ -493,23 +490,10 @@
{
char value[PROPERTY_VALUE_MAX];
property_get("debug.sensors", value, "0");
- const Vector<Sensor>& initialSensorList = (atoi(value)) ?
- mUserSensorListDebug : mUserSensorList;
- Vector<Sensor> accessibleSensorList;
- for (size_t i = 0; i < initialSensorList.size(); i++) {
- Sensor sensor = initialSensorList[i];
- if (canAccessSensor(sensor)) {
- accessibleSensorList.add(sensor);
- } else {
- String8 infoMessage;
- infoMessage.appendFormat(
- "Skipped sensor %s because it requires permission %s",
- sensor.getName().string(),
- sensor.getRequiredPermission().string());
- ALOGI(infoMessage.string());
- }
+ if (atoi(value)) {
+ return mUserSensorListDebug;
}
- return accessibleSensorList;
+ return mUserSensorList;
}
sp<ISensorEventConnection> SensorService::createSensorEventConnection()
@@ -555,10 +539,6 @@
BatteryService::cleanup(c->getUid());
}
-Sensor SensorService::getSensorFromHandle(int handle) const {
- return mSensorMap.valueFor(handle)->getSensor();
-}
-
status_t SensorService::enable(const sp<SensorEventConnection>& connection,
int handle, nsecs_t samplingPeriodNs, nsecs_t maxBatchReportLatencyNs, int reservedFlags)
{
@@ -569,11 +549,6 @@
if (sensor == NULL) {
return BAD_VALUE;
}
-
- if (!verifyCanAccessSensor(sensor->getSensor(), "Tried enabling")) {
- return BAD_VALUE;
- }
-
Mutex::Autolock _l(mLock);
SensorRecord* rec = mActiveSensors.valueFor(handle);
if (rec == 0) {
@@ -695,10 +670,6 @@
if (!sensor)
return BAD_VALUE;
- if (!verifyCanAccessSensor(sensor->getSensor(), "Tried configuring")) {
- return BAD_VALUE;
- }
-
if (ns < 0)
return BAD_VALUE;
@@ -712,44 +683,17 @@
status_t SensorService::flushSensor(const sp<SensorEventConnection>& connection,
int handle) {
- if (mInitCheck != NO_ERROR) return mInitCheck;
- SensorInterface* sensor = mSensorMap.valueFor(handle);
- if (sensor == NULL) {
- return BAD_VALUE;
- }
-
- if (!verifyCanAccessSensor(sensor->getSensor(), "Tried flushing")) {
- return BAD_VALUE;
- }
-
- if (sensor->getSensor().getType() == SENSOR_TYPE_SIGNIFICANT_MOTION) {
- ALOGE("flush called on Significant Motion sensor");
- return INVALID_OPERATION;
- }
- return sensor->flush(connection.get(), handle);
+ if (mInitCheck != NO_ERROR) return mInitCheck;
+ SensorInterface* sensor = mSensorMap.valueFor(handle);
+ if (sensor == NULL) {
+ return BAD_VALUE;
+ }
+ if (sensor->getSensor().getType() == SENSOR_TYPE_SIGNIFICANT_MOTION) {
+ ALOGE("flush called on Significant Motion sensor");
+ return INVALID_OPERATION;
+ }
+ return sensor->flush(connection.get(), handle);
}
-
-
-bool SensorService::canAccessSensor(const Sensor& sensor) {
- String16 permissionString(sensor.getRequiredPermission());
- return permissionString.size() == 0 ||
- PermissionCache::checkCallingPermission(permissionString);
-}
-
-bool SensorService::verifyCanAccessSensor(const Sensor& sensor, const char* operation) {
- if (canAccessSensor(sensor)) {
- return true;
- } else {
- String8 errorMessage;
- errorMessage.appendFormat(
- "%s a sensor (%s) without holding its required permission: %s",
- operation,
- sensor.getName().string(),
- sensor.getRequiredPermission().string());
- return false;
- }
-}
-
// ---------------------------------------------------------------------------
SensorService::SensorRecord::SensorRecord(
@@ -817,9 +761,6 @@
bool SensorService::SensorEventConnection::addSensor(int32_t handle) {
Mutex::Autolock _l(mConnectionLock);
- if (!verifyCanAccessSensor(mService->getSensorFromHandle(handle), "Tried adding")) {
- return false;
- }
if (mSensorInfo.indexOfKey(handle) < 0) {
mSensorInfo.add(handle, FlushInfo());
return true;
diff --git a/services/sensorservice/SensorService.h b/services/sensorservice/SensorService.h
index e88ffc8..1dc2dd3 100644
--- a/services/sensorservice/SensorService.h
+++ b/services/sensorservice/SensorService.h
@@ -131,7 +131,6 @@
String8 getSensorName(int handle) const;
bool isVirtualSensor(int handle) const;
- Sensor getSensorFromHandle(int handle) const;
void recordLastValue(const sensors_event_t* buffer, size_t count);
static void sortEventBuffer(sensors_event_t* buffer, size_t count);
Sensor registerSensor(SensorInterface* sensor);
@@ -142,8 +141,7 @@
const sp<SensorEventConnection>& connection, int handle);
void cleanupAutoDisabledSensor(const sp<SensorEventConnection>& connection,
sensors_event_t const* buffer, const int count);
- static bool canAccessSensor(const Sensor& sensor);
- static bool verifyCanAccessSensor(const Sensor& sensor, const char* operation);
+
// constants
Vector<Sensor> mSensorList;
Vector<Sensor> mUserSensorListDebug;