Revert "Revert "Revert "Protect against null strings in hal wrapper implementation."""
This reverts commit 8dbdf39b9a
.
Bug: 35421240
Change-Id: I4dc6934d79b1822d500cffaf91f9812387413707
This commit is contained in:
parent
8dbdf39b9a
commit
5f81564de2
1 changed files with 4 additions and 4 deletions
|
@ -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;
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue