Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fixed bugs when deliver GnssMeasurement from N-HAL" into nyc-dev

Browse Source
This commit is contained in:
Lifu Tang
2016-04-13 23:35:59 +00:00
committed by Android (Google) Code Review
parent 9e31b3fd81 96635bd056
commit ceeb44daf9
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
services/core/jni/com_android_server_location_GnssLocationProvider.cpp
View File

@@ -1165,7 +1165,7 @@ static jobject translate_gps_clock(JNIEnv* env, GpsClock* clock) {
static jobject translate_gnss_clock(JNIEnv* env, GnssClock* clock) { static jobject translate_gnss_clock(JNIEnv* env, GnssClock* clock) {
JavaObject object(env, "android/location/GnssClock"); JavaObject object(env, "android/location/GnssClock");
GpsClockFlags flags = clock->flags; GnssClockFlags flags = clock->flags;
SET_IF(GNSS_CLOCK_HAS_LEAP_SECOND, SET_IF(GNSS_CLOCK_HAS_LEAP_SECOND,
LeapSecond, LeapSecond,
@@ -1237,9 +1237,10 @@ static jobject translate_gps_measurement(JNIEnv* env,
static jobject translate_gnss_measurement(JNIEnv* env, static jobject translate_gnss_measurement(JNIEnv* env,
GnssMeasurement* measurement) { GnssMeasurement* measurement) {
JavaObject object(env, "android/location/GnssMeasurement"); JavaObject object(env, "android/location/GnssMeasurement");
GpsMeasurementFlags flags = measurement->flags;
SET(Svid, measurement->svid); GnssMeasurementFlags flags = measurement->flags;
SET(Svid, static_cast<int32_t>(measurement->svid));
SET(ConstellationType, static_cast<int32_t>(measurement->constellation)); SET(ConstellationType, static_cast<int32_t>(measurement->constellation));
SET(TimeOffsetNanos, measurement->time_offset_ns); SET(TimeOffsetNanos, measurement->time_offset_ns);
SET(State, static_cast<int32_t>(measurement->state)); SET(State, static_cast<int32_t>(measurement->state));
@@ -1379,8 +1380,8 @@ static void gnss_measurement_callback(GnssData* data) {
ALOGE("Invalid data provided to gps_measurement_callback"); ALOGE("Invalid data provided to gps_measurement_callback");
return; return;
} }
if (data->size != sizeof(GpsData)) { if (data->size != sizeof(GnssData)) {
ALOGE("Invalid GpsData size found in gps_measurement_callback, " ALOGE("Invalid GnssData size found in gnss_measurement_callback, "
"size=%zd", "size=%zd",
data->size); data->size);
return; return;