summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorandroid-build-team Robot <android-build-team-robot@google.com>2017-09-13 07:36:58 +0000
committerandroid-build-team Robot <android-build-team-robot@google.com>2017-09-13 07:36:58 +0000
commit4fd40b3c5a63127b872697a54d6b9e9b671d16b3 (patch)
tree13bcc10b3a349f7d2252492dea3d56d965eb01c3
parent405d3cf7454124ab538b976132928dca3205dd77 (diff)
parent3428f8cb77af532b0252b48163787b1ea6c4752b (diff)
downloadgps-4fd40b3c5a63127b872697a54d6b9e9b671d16b3.tar.gz
release-request-b613f8ce-05b5-465e-b783-c1b87f3c1e95-for-git_oc-mr1-release-4332123 snap-temp-L59300000101925107
Change-Id: I8f6180f01c203dc2e97cafe9fd36831835ef280c
-rw-r--r--msm8996/loc_api/libloc_api_50001/loc.cpp5
-rw-r--r--msm8998/android/AGnssRil.cpp6
2 files changed, 5 insertions, 6 deletions
diff --git a/msm8996/loc_api/libloc_api_50001/loc.cpp b/msm8996/loc_api/libloc_api_50001/loc.cpp
index 99548c6..4970915 100644
--- a/msm8996/loc_api/libloc_api_50001/loc.cpp
+++ b/msm8996/loc_api/libloc_api_50001/loc.cpp
@@ -170,7 +170,7 @@ static inline void closeSocket(const int socketFd) {
}
}
-static inline bool sendConnectionEvent(const bool connected, const uint8_t type) {
+static inline bool sendConnectionEvent(const bool connected, const int8_t type) {
int socketFd = createSocket();
if (socketFd < 0) {
LOC_LOGe("XTRA unreachable. sending failed.");
@@ -1063,8 +1063,7 @@ static void loc_agps_ril_ni_message(uint8_t *msg, size_t len) {}
static void loc_agps_ril_update_network_state(int connected, int type, int roaming, const char* extra_info) {
ENTRY_LOG();
// for XTRA
- sendConnectionEvent((connected != 0) ? true : false,
- (uint8_t)type);
+ sendConnectionEvent((connected != 0) ? true : false, type);
EXIT_LOG(%s, VOID_RET);
}
diff --git a/msm8998/android/AGnssRil.cpp b/msm8998/android/AGnssRil.cpp
index b19f55f..f3bbe7c 100644
--- a/msm8998/android/AGnssRil.cpp
+++ b/msm8998/android/AGnssRil.cpp
@@ -37,7 +37,7 @@ namespace gnss {
namespace V1_0 {
namespace implementation {
-static bool sendConnectionEvent(const bool connected, const uint8_t type);
+static bool sendConnectionEvent(const bool connected, const int8_t type);
AGnssRil::AGnssRil(Gnss* gnss) : mGnss(gnss) {
ENTRY_LOG_CALLFLOW();
@@ -51,7 +51,7 @@ Return<bool> AGnssRil::updateNetworkState(bool connected, NetworkType type, bool
ENTRY_LOG_CALLFLOW();
// for XTRA
- sendConnectionEvent(connected, (uint8_t)type);
+ sendConnectionEvent(connected, (int8_t)type);
return true;
}
@@ -88,7 +88,7 @@ static inline void closeSocket(const int socketFd) {
}
}
-static inline bool sendConnectionEvent(const bool connected, const uint8_t type) {
+static inline bool sendConnectionEvent(const bool connected, const int8_t type) {
int socketFd = createSocket();
if (socketFd < 0) {
LOC_LOGe("XTRA unreachable. sending failed.");