From cd5c8489bc133e907d0a9057a16c944e99647710 Mon Sep 17 00:00:00 2001
From: Tushar Janefalkar <tusharj@codeaurora.org>
Date: Mon, 16 Jun 2014 14:01:33 -0700
Subject: [PATCH] Changes for GPS HAL compilation

Remove dependence on android_runtime and
return invalid value if gps daemon is not
responding

CRs-fixed: 649065

Change-Id: I16dbf1bffe6193114c1da08730f0627377179a2a
---
 core/MsgTask.cpp                              | 1 -
 loc_api/libloc_api_50001/loc_eng_dmn_conn.cpp | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/core/MsgTask.cpp b/core/MsgTask.cpp
index 4db992d9..5d375aa5 100644
--- a/core/MsgTask.cpp
+++ b/core/MsgTask.cpp
@@ -35,7 +35,6 @@
 #include <msg_q.h>
 #include <log_util.h>
 #include <loc_log.h>
-#include <android_runtime/AndroidRuntime.h>
 
 namespace loc_core {
 
diff --git a/loc_api/libloc_api_50001/loc_eng_dmn_conn.cpp b/loc_api/libloc_api_50001/loc_eng_dmn_conn.cpp
index 918ae220..c257dff4 100644
--- a/loc_api/libloc_api_50001/loc_eng_dmn_conn.cpp
+++ b/loc_api/libloc_api_50001/loc_eng_dmn_conn.cpp
@@ -137,7 +137,7 @@ static int loc_api_server_proc(void *context)
         free(p_cmsgbuf);
         LOC_LOGE("%s:%d] fail receiving msg from gpsone_daemon, retry later\n", __func__, __LINE__);
         usleep(1000);
-        return 0;
+        return -1;
     }
 
     LOC_LOGD("%s:%d] received ctrl_type = %d\n", __func__, __LINE__, p_cmsgbuf->ctrl_type);