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

dynamic_sensor: Support recognizing head tracker sensor. am: dbf2545214

Browse source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/libhardware/+/16382054

Change-Id: I5e1cc7043ae62737fe23a8c7abffd594669bc8cc
This commit is contained in:
Erik Staats 2021-12-03 14:21:37 +00:00 committed by Automerger Merge Worker
commit ec9039d20a
2 changed files with 51 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

61
modules/sensors/dynamic_sensor/HidRawSensor.cpp
View file

@ -492,13 +492,8 @@ bool HidRawSensor::populateFeatureValueFromFeatureReport(
}
break;
case SENSOR_DESCRIPTION:
if (!r.isByteAligned() || r.bitSize != 16 || r.count < 1
|| (r.bitOffset / 8 + r.count * 2) > buffer.size() ) {
// invalid description
break;
}
if (decodeString(r, buffer, &str)) {
mFeatureInfo.isAndroidCustom = detectAndroidCustomSensor(str);
detectSensorFromDescription(str);
}
break;
default:
@ -583,26 +578,34 @@ bool HidRawSensor::validateFeatureValueAndBuildSensor() {
bool HidRawSensor::decodeString(
const HidParser::ReportItem &report, const std::vector<uint8_t> &buffer, std::string *d) {
if (!report.isByteAligned() || report.bitSize != 16 || report.count < 1) {
if (!report.isByteAligned() ||
(report.bitSize != 8 && report.bitSize != 16) || report.count < 1) {
return false;
}
size_t charSize = report.bitSize / 8;
size_t offset = report.bitOffset / 8;
if (offset + report.count * 2 > buffer.size()) {
if (offset + report.count * charSize > buffer.size()) {
return false;
}
std::vector<uint16_t> data(report.count);
auto i = data.begin();
auto j = buffer.begin() + offset;
for ( ; i != data.end(); ++i, j += sizeof(uint16_t)) {
// hid specified little endian
*i = *j + (*(j + 1) << 8);
}
std::wstring wstr(data.begin(), data.end());
if (charSize == 1) {
*d = std::string(buffer.begin() + offset,
buffer.begin() + offset + report.count);
} else {
std::vector<uint16_t> data(report.count);
auto i = data.begin();
auto j = buffer.begin() + offset;
for ( ; i != data.end(); ++i, j += sizeof(uint16_t)) {
// hid specified little endian
*i = *j + (*(j + 1) << 8);
}
std::wstring wstr(data.begin(), data.end());
std::wstring_convert<std::codecvt_utf8<wchar_t>, wchar_t> converter;
*d = converter.to_bytes(wstr);
}
std::wstring_convert<std::codecvt_utf8<wchar_t>, wchar_t> converter;
*d = converter.to_bytes(wstr);
return true;
}
@ -621,6 +624,28 @@ std::vector<std::string> split(const std::string &text, char sep) {
return tokens;
}
void HidRawSensor::detectSensorFromDescription(const std::string &description) {
if (detectAndroidHeadTrackerSensor(description) ||
detectAndroidCustomSensor(description)) {
mFeatureInfo.isAndroidCustom = true;
}
}
bool HidRawSensor::detectAndroidHeadTrackerSensor(
const std::string &description) {
if (description.find("#AndroidHeadTracker#1.") != 0) {
return false;
}
mFeatureInfo.type = SENSOR_TYPE_DEVICE_PRIVATE_BASE;
mFeatureInfo.typeString = CUSTOM_TYPE_PREFIX + "headtracker";
mFeatureInfo.reportModeFlag = SENSOR_FLAG_CONTINUOUS_MODE;
mFeatureInfo.permission = "";
mFeatureInfo.isWakeUp = false;
return true;
}
bool HidRawSensor::detectAndroidCustomSensor(const std::string &description) {
size_t nullPosition = description.find('\0');
if (nullPosition == std::string::npos) {

8
modules/sensors/dynamic_sensor/HidRawSensor.h
View file

@ -121,6 +121,14 @@ private:
// helper function to find sensor control feature usage from packets
bool findSensorControlUsage(const std::vector<HidParser::ReportPacket> &packets);
// try to parse sensor description feature value to see if it matches any
// known sensors
void detectSensorFromDescription(const std::string &description);
// try to parse sensor description feature value to see if it matches the
// Android header tracker sensor
bool detectAndroidHeadTrackerSensor(const std::string &description);
// try to parse sensor description feature value to see if it matches
// android specified custom sensor definition.
bool detectAndroidCustomSensor(const std::string &description);