Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8dbdf39b authored by Steven Moreland's avatar Steven Moreland
Browse files

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

This reverts commit 4cc22a0b.

Reason for revert: Accidental +2, still waiting on: aosp 345923

Change-Id: I57e062b267ad54632c6d7fcd464c7a0dd773de33
parent 4cc22a0b

sensors/1.0/default/convert.cpp

+4 −4
Original line number Diff line number Diff line
@@ -25,8 +25,8 @@ namespace V1_0 { 
namespace implementation {



void convertFromSensor(const sensor_t &src, SensorInfo *dst) {

    dst->name = src.name;

    dst->vendor = src.vendor;

    dst->name = src.name == nullptr ? "" : src.name;

    dst->vendor = src.vendor == nullptr ? "" : 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;

    dst->requiredPermission = src.requiredPermission;

    dst->typeAsString = src.stringType == nullptr ? "" : src.stringType;

    dst->requiredPermission = src.requiredPermission == nullptr ? "" : src.requiredPermission;

    dst->maxDelay = src.maxDelay;

    dst->flags = src.flags;

}