commit 306aedc264f2c6555ebe2c5af5c01aef1b4a884a
author android-build-team Robot <android-build-team-robot@google.com> Thu Sep 21 21:56:49 2017 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Thu Sep 21 21:56:49 2017 +0000
tree 13bcc10b3a349f7d2252492dea3d56d965eb01c3
parent fff7a862d8819d14dd2a821ae19788c01acf1655
parent 4fd40b3c5a63127b872697a54d6b9e9b671d16b3

release-request-a84b3435-75fa-41e8-bd3c-ca0f4cbd5cc5-for-git_oc-m2-release-4352002 snap-temp-L88700000105039240

Change-Id: Ibaac30d0fab0c0e90f06df858fb307a461d91c2b

msm8996/loc_api/libloc_api_50001/loc.cpp

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 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_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);
 }

msm8998/android/AGnssRil.cpp

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 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 @@
     ENTRY_LOG_CALLFLOW();
 
     // for XTRA
-    sendConnectionEvent(connected, (uint8_t)type);
+    sendConnectionEvent(connected, (int8_t)type);
 
     return true;
 }
@@ -88,7 +88,7 @@
     }
 }
 
-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.");