tequilaOS/platform_hardware_interfaces
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Fix VTS SensorsHidl Test Failures" am: 98e36a4ca8 am: fadbaf00f9 am: 5e00533a44

Browse source 
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1493936

Change-Id: Ic894f642521adfa860ffed50b55521cf6215c727
This commit is contained in:
Karthik Bharadwaj 2020-11-13 08:25:16 +00:00 committed by Automerger Merge Worker
commit 3453a4d198
8 changed files with 28 additions and 58 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
sensors/common/default/2.X/Sensor.cpp
View file

@ -57,11 +57,11 @@ const SensorInfo& Sensor::getSensorInfo() const {
return mSensorInfo;
}
void Sensor::batch(int32_t samplingPeriodNs) {
if (samplingPeriodNs < mSensorInfo.minDelay * 1000) {
samplingPeriodNs = mSensorInfo.minDelay * 1000;
} else if (samplingPeriodNs > mSensorInfo.maxDelay * 1000) {
samplingPeriodNs = mSensorInfo.maxDelay * 1000;
void Sensor::batch(int64_t samplingPeriodNs) {
if (samplingPeriodNs < mSensorInfo.minDelay * 1000ll) {
samplingPeriodNs = mSensorInfo.minDelay * 1000ll;
} else if (samplingPeriodNs > mSensorInfo.maxDelay * 1000ll) {
samplingPeriodNs = mSensorInfo.maxDelay * 1000ll;
}
if (mSamplingPeriodNs != samplingPeriodNs) {
@ -133,6 +133,11 @@ bool Sensor::isWakeUpSensor() {
}
std::vector<Event> Sensor::readEvents() {
// For an accelerometer sensor type, default the z-direction
// value to -9.8
float zValue = (mSensorInfo.type == SensorType::ACCELEROMETER)
? -9.8 : 0.0;
std::vector<Event> events;
Event event;
event.sensorHandle = mSensorInfo.sensorHandle;
@ -140,7 +145,7 @@ std::vector<Event> Sensor::readEvents() {
event.timestamp = ::android::elapsedRealtimeNano();
event.u.vec3.x = 0;
event.u.vec3.y = 0;
event.u.vec3.z = 0;
event.u.vec3.z = zValue;
event.u.vec3.status = SensorStatus::ACCURACY_HIGH;
events.push_back(event);
return events;
@ -330,25 +335,6 @@ AmbientTempSensor::AmbientTempSensor(int32_t sensorHandle, ISensorsEventCallback
mSensorInfo.flags = static_cast<uint32_t>(SensorFlagBits::ON_CHANGE_MODE);
};
DeviceTempSensor::DeviceTempSensor(int32_t sensorHandle, ISensorsEventCallback* callback)
: OnChangeSensor(callback) {
mSensorInfo.sensorHandle = sensorHandle;
mSensorInfo.name = "Device Temp Sensor";
mSensorInfo.vendor = "Vendor String";
mSensorInfo.version = 1;
mSensorInfo.type = SensorType::TEMPERATURE;
mSensorInfo.typeAsString = "";
mSensorInfo.maxRange = 80.0f;
mSensorInfo.resolution = 0.01f;
mSensorInfo.power = 0.001f;
mSensorInfo.minDelay = 40 * 1000; // microseconds
mSensorInfo.maxDelay = kDefaultMaxDelayUs;
mSensorInfo.fifoReservedEventCount = 0;
mSensorInfo.fifoMaxEventCount = 0;
mSensorInfo.requiredPermission = "";
mSensorInfo.flags = static_cast<uint32_t>(SensorFlagBits::ON_CHANGE_MODE);
}
RelativeHumiditySensor::RelativeHumiditySensor(int32_t sensorHandle,
ISensorsEventCallback* callback)
: OnChangeSensor(callback) {

9
sensors/common/default/2.X/Sensor.h
View file

@ -32,7 +32,7 @@ namespace sensors {
namespace V2_X {
namespace implementation {
static constexpr float kDefaultMaxDelayUs = 10 * 1000 * 1000;
static constexpr int32_t kDefaultMaxDelayUs = 10 * 1000 * 1000;
class ISensorsEventCallback {
public:
@ -54,7 +54,7 @@ class Sensor {
virtual ~Sensor();
const SensorInfo& getSensorInfo() const;
void batch(int32_t samplingPeriodNs);
void batch(int64_t samplingPeriodNs);
virtual void activate(bool enable);
Result flush();
@ -113,11 +113,6 @@ class AmbientTempSensor : public OnChangeSensor {
AmbientTempSensor(int32_t sensorHandle, ISensorsEventCallback* callback);
};
class DeviceTempSensor : public OnChangeSensor {
public:
DeviceTempSensor(int32_t sensorHandle, ISensorsEventCallback* callback);
};
class PressureSensor : public Sensor {
public:
PressureSensor(int32_t sensorHandle, ISensorsEventCallback* callback);

1
sensors/common/default/2.X/Sensors.h
View file

@ -64,7 +64,6 @@ struct Sensors : public ISensorsInterface, public ISensorsEventCallback {
AddSensor<AccelSensor>();
AddSensor<GyroSensor>();
AddSensor<AmbientTempSensor>();
AddSensor<DeviceTempSensor>();
AddSensor<PressureSensor>();
AddSensor<MagnetometerSensor>();
AddSensor<LightSensor>();

18
sensors/common/default/2.X/multihal/tests/fake_subhal/Sensor.cpp
View file

@ -71,9 +71,10 @@ const SensorInfo& Sensor::getSensorInfo() const {
return mSensorInfo;
}
void Sensor::batch(int32_t samplingPeriodNs) {
samplingPeriodNs =
std::clamp(samplingPeriodNs, mSensorInfo.minDelay * 1000, mSensorInfo.maxDelay * 1000);
void Sensor::batch(int64_t samplingPeriodNs) {
samplingPeriodNs = std::clamp(samplingPeriodNs,
static_cast<int64_t>(mSensorInfo.minDelay) * 1000,
static_cast<int64_t>(mSensorInfo.maxDelay) * 1000);
if (mSamplingPeriodNs != samplingPeriodNs) {
mSamplingPeriodNs = samplingPeriodNs;
@ -323,17 +324,6 @@ AmbientTempSensor::AmbientTempSensor(int32_t sensorHandle, ISensorsEventCallback
mSensorInfo.minDelay = 40 * 1000; // microseconds
}
DeviceTempSensor::DeviceTempSensor(int32_t sensorHandle, ISensorsEventCallback* callback)
: ContinuousSensor(sensorHandle, callback) {
mSensorInfo.name = "Device Temp Sensor";
mSensorInfo.type = SensorType::TEMPERATURE;
mSensorInfo.typeAsString = SENSOR_STRING_TYPE_TEMPERATURE;
mSensorInfo.maxRange = 80.0f;
mSensorInfo.resolution = 0.01f;
mSensorInfo.power = 0.001f;
mSensorInfo.minDelay = 40 * 1000; // microseconds
}
RelativeHumiditySensor::RelativeHumiditySensor(int32_t sensorHandle,
ISensorsEventCallback* callback)
: OnChangeSensor(sensorHandle, callback) {

7
sensors/common/default/2.X/multihal/tests/fake_subhal/Sensor.h
View file

@ -49,7 +49,7 @@ class Sensor {
virtual ~Sensor();
const SensorInfo& getSensorInfo() const;
void batch(int32_t samplingPeriodNs);
void batch(int64_t samplingPeriodNs);
virtual void activate(bool enable);
Result flush();
@ -114,11 +114,6 @@ class GyroSensor : public ContinuousSensor {
std::vector<Event> readEvents() override;
};
class DeviceTempSensor : public ContinuousSensor {
public:
DeviceTempSensor(int32_t sensorHandle, ISensorsEventCallback* callback);
};
class PressureSensor : public ContinuousSensor {
public:
PressureSensor(int32_t sensorHandle, ISensorsEventCallback* callback);

2
sensors/common/default/2.X/multihal/tests/fake_subhal/SensorsSubHal.h
View file

@ -206,7 +206,6 @@ class ContinuousSensorsSubHal : public SubHalVersion {
ISensorsSubHalBase::AddSensor<GyroSensor>();
ISensorsSubHalBase::AddSensor<MagnetometerSensor>();
ISensorsSubHalBase::AddSensor<PressureSensor>();
ISensorsSubHalBase::AddSensor<DeviceTempSensor>();
}
};
@ -231,7 +230,6 @@ class AllSensorsSubHal : public SubHalVersion {
ISensorsSubHalBase::AddSensor<GyroSensor>();
ISensorsSubHalBase::AddSensor<MagnetometerSensor>();
ISensorsSubHalBase::AddSensor<PressureSensor>();
ISensorsSubHalBase::AddSensor<DeviceTempSensor>();
ISensorsSubHalBase::AddSensor<AmbientTempSensor>();
ISensorsSubHalBase::AddSensor<LightSensor>();
ISensorsSubHalBase::AddSensor<ProximitySensor>();

6
sensors/common/vts/2_X/VtsHalSensorsV2_XTargetTest.h
View file

@ -845,7 +845,11 @@ void SensorsHidlTest::verifyRegisterDirectChannel(
std::shared_ptr<SensorsTestSharedMemory<SensorTypeVersion, EventType>> mem,
int32_t* directChannelHandle, bool supportsSharedMemType, bool supportsAnyDirectChannel) {
char* buffer = mem->getBuffer();
memset(buffer, 0xff, mem->getSize());
size_t size = mem->getSize();
if (supportsSharedMemType) {
memset(buffer, 0xff, size);
}
registerDirectChannel(mem->getSharedMemInfo(), [&](Result result, int32_t channelHandle) {
if (supportsSharedMemType) {

7
sensors/common/vts/utils/include/sensors-vts-utils/SensorsHidlTestBase.h
View file

@ -109,7 +109,6 @@ static SensorFlagBits expectedReportModeForType(SensorTypeT type) {
case SensorTypeT::MAGNETIC_FIELD:
case SensorTypeT::ORIENTATION:
case SensorTypeT::PRESSURE:
case SensorTypeT::TEMPERATURE:
case SensorTypeT::GRAVITY:
case SensorTypeT::LINEAR_ACCELERATION:
case SensorTypeT::ROTATION_VECTOR:
@ -145,6 +144,10 @@ static SensorFlagBits expectedReportModeForType(SensorTypeT type) {
case SensorTypeT::DYNAMIC_SENSOR_META:
return SensorFlagBits::SPECIAL_REPORTING_MODE;
case SensorTypeT::TEMPERATURE:
ALOGW("Device temperature sensor is deprecated, ignoring for test");
return (SensorFlagBits)-1;
default:
ALOGW("Type %d is not implemented in expectedReportModeForType", (int)type);
return (SensorFlagBits)-1;
@ -334,7 +337,7 @@ class SensorsHidlTestBase : public testing::TestWithParam<std::string> {
usleep(500000); // sleep 0.5 sec to wait for change rate to happen
events1 = collectEvents(collectionTimeoutUs, minNEvent, getEnvironment());
// second collection, without stop sensor
// second collection, without stopping the sensor
ASSERT_EQ(batch(handle, secondCollectionPeriod, batchingPeriodInNs), Result::OK);
usleep(500000); // sleep 0.5 sec to wait for change rate to happen