DataItem changes to fix incorrect NetworkInfo connect handling

NetworkInfoBaase added a type to allTypes protected method so
that derived class can use it. Also, the SystemStatusNetworkInfo
no longer compares names in its equal(), as it only is going to
return false when comparing GnssLocationProvider NetworkInfo and
OsAgent NetworkInfo.

Change-Id: I363f27f4ed7be4aab2a4c4c033d5dff69d0a47d9
CRs-Fixed: 2251564

1 files changed, 2 insertions, 11 deletions

diff --git a/core/SystemStatus.h b/core/SystemStatus.h
index 1c3adc8..657720d 100644
--- a/core/SystemStatus.h
+++ b/core/SystemStatus.h
@@ -466,7 +466,6 @@ public:
             int32_t type=0,
             std::string typeName="",
             string subTypeName="",
-            bool available=false,
             bool connected=false,
             bool roaming=false) :
             NetworkInfoDataItemBase(
@@ -474,7 +473,7 @@ public:
                     type,
                     typeName,
                     subTypeName,
-                    available,
+                    connected && (!roaming),
                     connected,
                     roaming),
             mSrcObjPtr(nullptr) {}
@@ -484,15 +483,7 @@ public:
         mType = itemBase.getType();
     }
     inline bool equals(const SystemStatusNetworkInfo& peer) {
-        if ((mAllTypes == peer.mAllTypes) &&
-            (mTypeName == peer.mTypeName) &&
-            (mSubTypeName == peer.mSubTypeName) &&
-            (mAvailable == peer.mAvailable) &&
-            (mConnected == peer.mConnected) &&
-            (mRoaming == peer.mRoaming)) {
-            return true;
-        }
-        return false;
+        return (mAllTypes == peer.mAllTypes);
     }
     inline virtual SystemStatusItemBase& collate(SystemStatusItemBase& curInfo) {
         uint64_t allTypes = (static_cast<SystemStatusNetworkInfo&>(curInfo)).mAllTypes;