commit eb40aae254642dfcb333798c642920814b410115
author Eddie Ho <eddie_ho@htc.com> Fri Sep 04 07:03:22 2009 -0400
committer Mike Lockwood <lockwood@android.com> Fri Sep 04 07:05:08 2009 -0400
tree dd788366d0b9b88052b6d1df0aa87f6ba5cd8f31
parent f163f7f0f29f0898eb82f54cf657cb34668abade

GPS: Fix race condition reporting NMEA data.

Change-Id: I80997e2686d9c08d7d2def094f9922e83cf41013
Signed-off-by: Mike Lockwood <lockwood@android.com>

core/jni/android_location_GpsLocationProvider.cpp

diff --git a/core/jni/android_location_GpsLocationProvider.cpp b/core/jni/android_location_GpsLocationProvider.cpp
index c329602..4aed277 100755
--- a/core/jni/android_location_GpsLocationProvider.cpp
+++ b/core/jni/android_location_GpsLocationProvider.cpp
@@ -370,14 +370,14 @@
 
 static jint android_location_GpsLocationProvider_read_nmea(JNIEnv* env, jobject obj, jint index, jbyteArray nmeaArray, jint buffer_size)
 {
-    // this should only be called from within a call to reportStatus, so we don't need to lock here
+    // this should only be called from within a call to reportNmea, so we don't need to lock here
 
     jbyte* nmea = env->GetByteArrayElements(nmeaArray, 0);
 
-    int length = strlen(sNmeaBuffer[index].nmea);
+    int length = strlen(sNmeaBufferCopy[index].nmea);
     if (length > buffer_size)
         length = buffer_size;
-    memcpy(nmea, sNmeaBuffer[index].nmea, length);
+    memcpy(nmea, sNmeaBufferCopy[index].nmea, length);
 
     env->ReleaseByteArrayElements(nmeaArray, nmea, 0);
     return length;