darkkirb/android_device_lenovo_msm8937-common
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

land: gps: fix build for OSS builds

Browse source 
Squash of the following commits:

gps: Correct forward declaration in proprietary definitions

The qcom prebuilt binary relies on FlpExtLocation_s,
so we cannot change it to FlpExtLocation.
This patch fixes it.

karate: gps: fix remove trailing space

In setXtraUserAgent,
size_t is unsigned and never being negative.
Will cause segmentation fault, if string is all space.

Change-Id: I1cf1f956943b0739640afe909954ade6921e28a1
This commit is contained in:
Scott Mertz 2015-11-06 17:44:53 -08:00 committed by karthick111
parent ecf15a1c13
commit 85a6b00c53
2 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
gps/core/UlpProxyBase.h
View file

@ -30,7 +30,10 @@
#define ULP_PROXY_BASE_H #define ULP_PROXY_BASE_H
#include <gps_extended.h> #include <gps_extended.h>
#include "fused_location_extended.h"
struct FlpExtLocation_s;
struct FlpExtBatchOptions;
namespace loc_core { namespace loc_core {
class LocAdapterBase; class LocAdapterBase;
@ -101,7 +104,7 @@ public:
(void)active; (void)active;
return false; return false;
} }
inline virtual bool reportPositions(const FlpExtLocation* locations, inline virtual bool reportPositions(const struct FlpExtLocation_s* locations,
int32_t number_of_locations) { int32_t number_of_locations) {
(void)locations; (void)locations;
(void)number_of_locations; (void)number_of_locations;

8
gps/loc_api/libloc_api_50001/LocEngAdapter.cpp
View file

@ -195,9 +195,11 @@ void LocEngAdapter::setXtraUserAgent() {
fclose(file); fclose(file);
// remove trailing spaces // remove trailing spaces
size_t len = strlen(buf); char *s;
while (--len >= 0 && isspace(buf[len])) { s = buf + strlen(buf);
buf[len] = '\0'; while (--s >= buf) {
if (!isspace(*s)) break;
*s = 0;
} }
} }