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

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

Browse Source 
am: f75ac97a5c

* commit 'f75ac97a5cac358f964af764a461af4db015d30e':
  Fixed the crash caused by type mismatch
This commit is contained in:
Lifu Tang
2016-03-05 01:33:48 +00:00
committed by android-build-merger
parent 8fdacd7faf f75ac97a5c
commit 7ae2c2cc5c
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1205,7 +1205,8 @@ static jobject translate_gps_measurement(JNIEnv* env,
SET_IF(GNSS_MEASUREMENT_HAS_CARRIER_PHASE_UNCERTAINTY, SET_IF(GNSS_MEASUREMENT_HAS_CARRIER_PHASE_UNCERTAINTY,
CarrierPhaseUncertainty, CarrierPhaseUncertainty,
measurement->carrier_phase_uncertainty); 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); SET_IF(GNSS_MEASUREMENT_HAS_SNR, SnrInDb, measurement->snr_db);
return object.get(); return object.get();
@@ -1244,7 +1245,8 @@ static jobject translate_gnss_measurement(JNIEnv* env,
SET_IF(GNSS_MEASUREMENT_HAS_CARRIER_PHASE_UNCERTAINTY, SET_IF(GNSS_MEASUREMENT_HAS_CARRIER_PHASE_UNCERTAINTY,
CarrierPhaseUncertainty, CarrierPhaseUncertainty,
measurement->carrier_phase_uncertainty); 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); SET_IF(GNSS_MEASUREMENT_HAS_SNR, SnrInDb, measurement->snr_db);
return object.get(); return object.get();