From 8ad4430c57539d8b4cb5856bd9cfc3ba06ca6343 Mon Sep 17 00:00:00 2001
From: Lifu Tang <lifu@google.com>
Date: Wed, 20 Apr 2016 11:48:16 -0700
Subject: Fixed bug in upgrading GpsMeasurement

Bug: 28278410
Change-Id: I936e257d68c348654d6031eb3e8f6d63b28d5e0a
---
 services/core/jni/com_android_server_location_GnssLocationProvider.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/services/core/jni/com_android_server_location_GnssLocationProvider.cpp b/services/core/jni/com_android_server_location_GnssLocationProvider.cpp
index 058b631dfe3c..c5c90e02f200 100644
--- a/services/core/jni/com_android_server_location_GnssLocationProvider.cpp
+++ b/services/core/jni/com_android_server_location_GnssLocationProvider.cpp
@@ -1194,7 +1194,7 @@ static jobject translate_gps_measurement(JNIEnv* env,
     JavaObject object(env, "android/location/GnssMeasurement");
     GpsMeasurementFlags flags = measurement->flags;
     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));
     } else {
         ALOGD("Unknown constellation type with Svid = %d.", measurement->prn);
-- 
cgit v1.2.3-59-g8ed1b