summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Lifu Tang <lifu@google.com> 2016-02-11 21:06:00 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2016-02-11 21:06:01 +0000
commit94093b94ccec18adbf4b0b552a3526b52d2ca0e5 (patch)
treed2fa76286fe2330ad85bbeaa4ec9a9a0b946d9b1
parentfd32b894ff42fc20b373410b66ae924287537c47 (diff)
parenta2b74fd268ebce83eb1e3572695bb86b89f057ec (diff)
Merge "Fixed the build break" into nyc-dev
-rw-r--r--services/core/jni/com_android_server_location_GnssLocationProvider.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/services/core/jni/com_android_server_location_GnssLocationProvider.cpp b/services/core/jni/com_android_server_location_GnssLocationProvider.cpp
index 310d66010632..cdd551936511 100644
--- a/services/core/jni/com_android_server_location_GnssLocationProvider.cpp
+++ b/services/core/jni/com_android_server_location_GnssLocationProvider.cpp
@@ -122,7 +122,7 @@ static void sv_status_callback(GpsSvStatus* sv_status)
sGnssSvListSize = sv_status->num_svs;
// Clamp the list size. Legacy GpsSvStatus has only 32 elements in sv_list.
if (sGnssSvListSize > GPS_MAX_SATELLITE_COUNT) {
- ALOGW("Too many satellites %d. Clamps to %d.",
+ ALOGW("Too many satellites %zd. Clamps to %d.",
sGnssSvListSize,
GPS_MAX_SATELLITE_COUNT);
sGnssSvListSize = GPS_MAX_SATELLITE_COUNT;
@@ -172,7 +172,7 @@ static void gnss_sv_status_callback(GnssSvStatus* sv_status) {
sGnssSvListSize = sv_status->num_svs;
// Clamp the list size
if (sGnssSvListSize > GNSS_MAX_SATELLITE_COUNT) {
- ALOGD("Too many satellites %d. Clamps to %d.",
+ ALOGD("Too many satellites %zd. Clamps to %d.",
sGnssSvListSize,
GNSS_MAX_SATELLITE_COUNT);
sGnssSvListSize = GNSS_MAX_SATELLITE_COUNT;