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

Commit 7ae2c2cc authored by Lifu Tang's avatar Lifu Tang Committed by android-build-merger
Browse files

Merge "Fixed the crash caused by type mismatch" into nyc-dev 

am: f75ac97a

* commit 'f75ac97a':
  Fixed the crash caused by type mismatch
parents 8fdacd7f f75ac97a

services/core/jni/com_android_server_location_GnssLocationProvider.cpp

+4 −2
Original line number Diff line number Diff line
@@ -1205,7 +1205,8 @@ static jobject translate_gps_measurement(JNIEnv* env, 
    SET_IF(GNSS_MEASUREMENT_HAS_CARRIER_PHASE_UNCERTAINTY,

           CarrierPhaseUncertainty,

           measurement->carrier_phase_uncertainty);

    SET(MultipathIndicator, measurement->multipath_indicator);

    SET(MultipathIndicator,

        static_cast<int32_t>(measurement->multipath_indicator));

    SET_IF(GNSS_MEASUREMENT_HAS_SNR, SnrInDb, measurement->snr_db);



    return object.get();
@@ -1244,7 +1245,8 @@ static jobject translate_gnss_measurement(JNIEnv* env, 
    SET_IF(GNSS_MEASUREMENT_HAS_CARRIER_PHASE_UNCERTAINTY,

           CarrierPhaseUncertainty,

           measurement->carrier_phase_uncertainty);

    SET(MultipathIndicator, measurement->multipath_indicator);

    SET(MultipathIndicator,

        static_cast<int32_t>(measurement->multipath_indicator));

    SET_IF(GNSS_MEASUREMENT_HAS_SNR, SnrInDb, measurement->snr_db);



    return object.get();