Merge "Checking return for ODCPI CB"

This commit is contained in:
Linux Build Service Account 2018-06-28 19:49:34 -07:00 committed by Gerrit - the friendly Code Review server
commit 3463e547e7

View file

@ -434,10 +434,9 @@ void Gnss::odcpiRequestCb(const OdcpiRequestInfo& request) {
// For emergency mode, request DBH (Device based hybrid) location // For emergency mode, request DBH (Device based hybrid) location
// Mark Independent from GNSS flag to false. // Mark Independent from GNSS flag to false.
if (ODCPI_REQUEST_TYPE_START == request.type) { if (ODCPI_REQUEST_TYPE_START == request.type) {
if (request.isEmergencyMode) { auto r = mGnssCbIface_1_1->gnssRequestLocationCb(!request.isEmergencyMode);
mGnssCbIface_1_1->gnssRequestLocationCb(false); if (!r.isOk()) {
} else { LOC_LOGe("Error invoking gnssRequestLocationCb %s", r.description().c_str());
mGnssCbIface_1_1->gnssRequestLocationCb(true);
} }
} else { } else {
LOC_LOGv("Unsupported ODCPI request type: %d", request.type); LOC_LOGv("Unsupported ODCPI request type: %d", request.type);