Snap for 7968112 from dbf2545214d16eaed5901bd41c8c8e8871ef0168 to sc-v2-release
Change-Id: Ib997e88b6354740fc623037cca0bc8e30c1b1d80
diff --git a/modules/sensors/dynamic_sensor/HidRawSensor.cpp b/modules/sensors/dynamic_sensor/HidRawSensor.cpp
index 531ab9d..8aaf2d4 100644
--- a/modules/sensors/dynamic_sensor/HidRawSensor.cpp
+++ b/modules/sensors/dynamic_sensor/HidRawSensor.cpp
@@ -492,13 +492,8 @@
}
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::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 @@
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) {
diff --git a/modules/sensors/dynamic_sensor/HidRawSensor.h b/modules/sensors/dynamic_sensor/HidRawSensor.h
index 99ddfe3..0989651 100644
--- a/modules/sensors/dynamic_sensor/HidRawSensor.h
+++ b/modules/sensors/dynamic_sensor/HidRawSensor.h
@@ -121,6 +121,14 @@
// 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);