Evolution-x/hardware_interfaces
1
0
Fork 0
mirror of https://github.com/Evolution-X/hardware_interfaces synced 2026-02-01 11:36:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Revert "Revert "Protect against null strings in hal wrapper implementation."""

Browse Source 
This reverts commit 8dbdf39b9a.

Bug: 35421240

Change-Id: I4dc6934d79b1822d500cffaf91f9812387413707
This commit is contained in:
Steven Moreland
2017-02-28 17:55:27 +00:00
parent 8dbdf39b9a
commit 5f81564de2
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
sensors/1.0/default/convert.cpp
View File

@@ -25,8 +25,8 @@ namespace V1_0 {
namespace implementation {
void convertFromSensor(const sensor_t &src, SensorInfo *dst) {
dst->name = src.name == nullptr ? "" : src.name;
dst->vendor = src.vendor == nullptr ? "" : src.vendor;
dst->name = src.name;
dst->vendor = src.vendor;
dst->version = src.version;
dst->sensorHandle = src.handle;
dst->type = (SensorType)src.type;
@@ -36,8 +36,8 @@ void convertFromSensor(const sensor_t &src, SensorInfo *dst) {
dst->minDelay = src.minDelay;
dst->fifoReservedEventCount = src.fifoReservedEventCount;
dst->fifoMaxEventCount = src.fifoMaxEventCount;
dst->typeAsString = src.stringType == nullptr ? "" : src.stringType;
dst->requiredPermission = src.requiredPermission == nullptr ? "" : src.requiredPermission;
dst->typeAsString = src.stringType;
dst->requiredPermission = src.requiredPermission;
dst->maxDelay = src.maxDelay;
dst->flags = src.flags;
}