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

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

Browse source
This commit is contained in:
Yifan Hong 2017-03-02 02:21:56 +00:00 committed by Android (Google) Code Review
commit 3268291060
1 changed files with 4 additions and 4 deletions
Show stats 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;
}