Merge remote-tracking branch 'goog/qcom/release/LA.UM.9.1.C11.11.00.00.841.243' into tm-dev am: 4a715198a7 am: 48d06d0586
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/qcom/sm8150/gps/+/17247876
Change-Id: Idb0dea6d49a4dccae4af750f59abe28c85cf0c07
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/core/LocApiBase.h b/core/LocApiBase.h
index 121f795..cbe5f9f 100644
--- a/core/LocApiBase.h
+++ b/core/LocApiBase.h
@@ -101,6 +101,7 @@
inline virtual void* getSibling2() { return NULL; }
inline virtual double getGloRfLoss(uint32_t left,
uint32_t center, uint32_t right, uint8_t gloFrequency) { return 0.0; }
+ inline virtual float getGeoidalSeparation(double latitude, double longitude) { return 0.0; }
};
class LocApiBase {
diff --git a/core/SystemStatus.h b/core/SystemStatus.h
index f116bbc..cd1d0c9 100644
--- a/core/SystemStatus.h
+++ b/core/SystemStatus.h
@@ -509,7 +509,7 @@
for (uint8_t i = 0; rtv && i < MAX_NETWORK_HANDLES; ++i) {
rtv &= (mAllNetworkHandles[i] == peer.mAllNetworkHandles[i]);
}
- return rtv & peer.mApn.compare(mApn);
+ return rtv && !peer.mApn.compare(mApn);
}
inline virtual SystemStatusItemBase& collate(SystemStatusItemBase& curInfo) {
LOC_LOGv("NetworkInfo: mAllTypes=%" PRIx64 " connected=%u mType=%x mApn=%s",
