From 235bbb1bb50b221da048063181f0f76a13e8014b Mon Sep 17 00:00:00 2001
From: Lifu Tang <lifu@google.com>
Date: Fri, 4 Mar 2016 17:01:06 -0800
Subject: [PATCH] Fixed the crash caused by type mismatch

Bug: 27503442
Change-Id: I019afc1f3dd872c8f9d79e9b6e589a77acd0cddc
---
 .../com_android_server_location_GnssLocationProvider.cpp    | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/services/core/jni/com_android_server_location_GnssLocationProvider.cpp b/services/core/jni/com_android_server_location_GnssLocationProvider.cpp
index aa14fff7d7419..60ed4977f984a 100644
--- a/services/core/jni/com_android_server_location_GnssLocationProvider.cpp
+++ b/services/core/jni/com_android_server_location_GnssLocationProvider.cpp
@@ -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();