From 17350f925f5ee4d4df92c768c92e442179b1a420 Mon Sep 17 00:00:00 2001 From: Lifu Tang Date: Tue, 22 Mar 2016 13:56:52 -0700 Subject: [PATCH] A few changes to the measurement implementation - Fixed the device crashing bug in JNI code - Fixed a typo ('lock' => 'clock') - Added hardware clock discontinuity count in toString() (cherry picked from commit 3a21b02ee2dc8f2c6c879109757d89a2be5d720a) Change-Id: I6dbda85abda20da0240ac08b22b81729eae7b6f0 --- location/java/android/location/GnssClock.java | 5 +++++ .../core/jni/com_android_server_location_GnssLocationProvider.cpp | 8 ++------ 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/location/java/android/location/GnssClock.java b/location/java/android/location/GnssClock.java index 2af479066c7b..df42a7328a99 100644 --- a/location/java/android/location/GnssClock.java +++ b/location/java/android/location/GnssClock.java @@ -471,6 +471,11 @@ public final class GnssClock implements Parcelable { "DriftUncertaintyNanosPerSecond", hasDriftUncertaintyNanosPerSecond() ? mDriftUncertaintyNanosPerSecond : null)); + builder.append(String.format( + format, + "HardwareClockDiscontinuityCount", + mHardwareClockDiscontinuityCount)); + return builder.toString(); } diff --git a/services/core/jni/com_android_server_location_GnssLocationProvider.cpp b/services/core/jni/com_android_server_location_GnssLocationProvider.cpp index e2c71a1aa2f8..ae050429efed 100644 --- a/services/core/jni/com_android_server_location_GnssLocationProvider.cpp +++ b/services/core/jni/com_android_server_location_GnssLocationProvider.cpp @@ -1108,7 +1108,7 @@ const char *const JavaMethodHelper::signature_ = "(Z)V"; } while (false) static jobject translate_gps_clock(JNIEnv* env, GpsClock* clock) { - static uint32_t discontinuity_count_to_handle_old_lock_type = 0; + static uint32_t discontinuity_count_to_handle_old_clock_type = 0; JavaObject object(env, "android/location/GnssClock"); GpsClockFlags flags = clock->flags; @@ -1137,7 +1137,7 @@ static jobject translate_gps_clock(JNIEnv* env, GpsClock* clock) { clock->full_bias_ns = clock->time_ns; clock->time_ns = 0; SET(HardwareClockDiscontinuityCount, - discontinuity_count_to_handle_old_lock_type++); + discontinuity_count_to_handle_old_clock_type++); break; } @@ -1226,10 +1226,6 @@ static jobject translate_gps_measurement(JNIEnv* env, static_cast(measurement->multipath_indicator)); SET_IF(GNSS_MEASUREMENT_HAS_SNR, SnrInDb, measurement->snr_db); - SET_IF_NOT(GPS_MEASUREMENT_HAS_UNCORRECTED_PSEUDORANGE_RATE, - PseudorangeRateCorrected, - true); - return object.get(); } -- 2.11.0