From 4bab73548d6c030cb4a30ac07b068b35e0553af4 Mon Sep 17 00:00:00 2001
From: Hoss Zhou <zhouh@codeaurora.org>
Date: Wed, 11 Jul 2018 17:24:08 +0800
Subject: [PATCH] Fix: Xtra connection initialization issue

HAL sends an empty field to Xtra when connections
is not updated.

Change-Id: I42c456581a1a968887880154f1ffffee12421354
CRs-Fixed: 2259165
---
 gnss/XtraSystemStatusObserver.cpp | 3 ++-
 gnss/XtraSystemStatusObserver.h   | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/gnss/XtraSystemStatusObserver.cpp b/gnss/XtraSystemStatusObserver.cpp
index de7d49ab..6df54800 100644
--- a/gnss/XtraSystemStatusObserver.cpp
+++ b/gnss/XtraSystemStatusObserver.cpp
@@ -132,7 +132,8 @@ inline bool XtraSystemStatusObserver::onStatusRequested(int32_t xtraStatusUpdate
     stringstream ss;
 
     ss << "respondStatus" << endl;
-    (mGpsLock == -1 ? ss : ss << mGpsLock) << endl << mConnections << endl
+    (mGpsLock == -1 ? ss : ss << mGpsLock) << endl;
+    (mConnections == (uint64_t)~0 ? ss : ss << mConnections) << endl
             << mTac << endl << mMccmnc << endl << mIsConnectivityStatusKnown;
 
     return ( send(LOC_IPC_XTRA, ss.str()) );
diff --git a/gnss/XtraSystemStatusObserver.h b/gnss/XtraSystemStatusObserver.h
index af0789b6..b49a0bcd 100644
--- a/gnss/XtraSystemStatusObserver.h
+++ b/gnss/XtraSystemStatusObserver.h
@@ -45,7 +45,7 @@ public :
     // constructor & destructor
     inline XtraSystemStatusObserver(IOsObserver* sysStatObs, const MsgTask* msgTask):
             mSystemStatusObsrvr(sysStatObs), mMsgTask(msgTask),
-            mGpsLock(-1), mConnections(0), mXtraThrottle(true), mReqStatusReceived(false),
+            mGpsLock(-1), mConnections(~0), mXtraThrottle(true), mReqStatusReceived(false),
             mDelayLocTimer(*this), mIsConnectivityStatusKnown (false) {
         subscribe(true);
         startListeningNonBlocking(LOC_IPC_HAL);