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

Commit 2aa14c97 authored by Lifu Tang's avatar Lifu Tang Committed by android-build-merger
Browse files

Merge "Fixed bug in upgrading GpsMeasurement" into nyc-dev am: e1b51715 am: 428b8827 

am: d67b3397

* commit 'd67b3397':
  Fixed bug in upgrading GpsMeasurement

Change-Id: Ic00d1474f59ed90c50ef815eed24ae433da1a843
parents 57fe3eea d67b3397

services/core/jni/com_android_server_location_GnssLocationProvider.cpp

+1 −1
Original line number Original line Diff line number Diff line
@@ -1194,7 +1194,7 @@ static jobject translate_gps_measurement(JNIEnv* env, 
    JavaObject object(env, "android/location/GnssMeasurement");

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

    GpsMeasurementFlags flags = measurement->flags;

    GpsMeasurementFlags flags = measurement->flags;

    SET(Svid, static_cast<int32_t>(measurement->prn));

    SET(Svid, static_cast<int32_t>(measurement->prn));

    if (measurement->prn >= 1 || measurement->prn <= 32) {

    if (measurement->prn >= 1 && measurement->prn <= 32) {

        SET(ConstellationType, static_cast<int32_t>(GNSS_CONSTELLATION_GPS));

        SET(ConstellationType, static_cast<int32_t>(GNSS_CONSTELLATION_GPS));

    } else {

    } else {

        ALOGD("Unknown constellation type with Svid = %d.", measurement->prn);

        ALOGD("Unknown constellation type with Svid = %d.", measurement->prn);