Merge 1ec396cbb15224022368ec878900b0f3164a6cbc on remote branch
Change-Id: I471d0fb995c93422e87e9b3326e753abb9b806d8
diff --git a/core/LocApiBase.cpp b/core/LocApiBase.cpp
index 6a0ff84..860da2e 100644
--- a/core/LocApiBase.cpp
+++ b/core/LocApiBase.cpp
@@ -1034,7 +1034,7 @@
struct timespec sinceBootTime;
struct timespec sinceBootTimeTest;
bool clockGetTimeSuccess = false;
- const uint32_t MAX_TIME_DELTA_VALUE_NANOS = 10000;
+ const uint32_t MAX_TIME_DELTA_VALUE_NANOS = 15000;
const uint32_t MAX_GET_TIME_COUNT = 20;
/* Attempt to get CLOCK_REALTIME and CLOCK_BOOTIME in succession without an interruption
or context switch (for up to MAX_GET_TIME_COUNT times) to avoid errors in the calculation */
diff --git a/core/SystemStatus.h b/core/SystemStatus.h
index bd4279e..638933a 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",