Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 53ca6bfe authored by Mike Cailean's avatar Mike Cailean Committed by android-build-merger
Browse files

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

am: ceeb44da

* commit 'ceeb44da':
  Fixed bugs when deliver GnssMeasurement from N-HAL

Change-Id: I970b1bafe67cfcc0caec5ad4fbe3073bb1e679d8
parents 034b58c2 ceeb44da

services/core/jni/com_android_server_location_GnssLocationProvider.cpp

+6 −5
Original line number Diff line number Diff line
@@ -1165,7 +1165,7 @@ static jobject translate_gps_clock(JNIEnv* env, GpsClock* clock) { 


static jobject translate_gnss_clock(JNIEnv* env, GnssClock* clock) {

    JavaObject object(env, "android/location/GnssClock");

    GpsClockFlags flags = clock->flags;

    GnssClockFlags flags = clock->flags;



    SET_IF(GNSS_CLOCK_HAS_LEAP_SECOND,

           LeapSecond,
@@ -1237,9 +1237,10 @@ static jobject translate_gps_measurement(JNIEnv* env, 
static jobject translate_gnss_measurement(JNIEnv* env,

                                          GnssMeasurement* measurement) {

    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(TimeOffsetNanos, measurement->time_offset_ns);

    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");

        return;

    }

    if (data->size != sizeof(GpsData)) {

        ALOGE("Invalid GpsData size found in gps_measurement_callback, "

    if (data->size != sizeof(GnssData)) {

        ALOGE("Invalid GnssData size found in gnss_measurement_callback, "

              "size=%zd",

              data->size);

        return;