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

Merge "Fix reference leak in GPS measurement JNI layer. b/16727892 b/17075171" into lmp-mr1-dev

Browse Source
This commit is contained in:
destradaa
2014-11-06 21:50:39 +00:00
committed by Android (Google) Code Review
parent b1d52e1d20 df11984011
commit c3e5599cdc
2 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
location/java/android/location/GpsClock.java
View File

@@ -492,6 +492,7 @@ public class GpsClock implements Parcelable {
setType(TYPE_UNKNOWN); setType(TYPE_UNKNOWN);
setTimeInNs(Long.MIN_VALUE); setTimeInNs(Long.MIN_VALUE);
resetTimeUncertaintyInNs(); resetTimeUncertaintyInNs();
resetFullBiasInNs();
resetBiasInNs(); resetBiasInNs();
resetBiasUncertaintyInNs(); resetBiasUncertaintyInNs();
resetDriftInNsPerSec(); resetDriftInNsPerSec();

1
services/core/jni/com_android_server_location_GpsLocationProvider.cpp
View File

@@ -1195,6 +1195,7 @@ static jobject translate_gps_measurement(JNIEnv* env, GpsMeasurement* measuremen
usedInFixSetterMethod, usedInFixSetterMethod,
(flags & GPS_MEASUREMENT_HAS_USED_IN_FIX) && measurement->used_in_fix); (flags & GPS_MEASUREMENT_HAS_USED_IN_FIX) && measurement->used_in_fix);
env->DeleteLocalRef(gpsMeasurementClass);
return gpsMeasurementObject; return gpsMeasurementObject;
} }