diff options
| author | destradaa <destradaa@google.com> | 2014-11-06 21:50:39 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-11-06 21:50:40 +0000 |
| commit | c3e5599cdc09a770d12433a98e7da93ec24d959d (patch) | |
| tree | 81dd75b3f25c89e4418ced9649140861c791ba5f | |
| parent | b1d52e1d2095d0df986d4c338af43c5cd2b6efc5 (diff) | |
| parent | df1198401101805a335535dd08231cbb0e2af500 (diff) | |
| download | frameworks_base-c3e5599cdc09a770d12433a98e7da93ec24d959d.zip frameworks_base-c3e5599cdc09a770d12433a98e7da93ec24d959d.tar.gz frameworks_base-c3e5599cdc09a770d12433a98e7da93ec24d959d.tar.bz2 | |
Merge "Fix reference leak in GPS measurement JNI layer. b/16727892 b/17075171" into lmp-mr1-dev
| -rw-r--r-- | location/java/android/location/GpsClock.java | 1 | ||||
| -rw-r--r-- | services/core/jni/com_android_server_location_GpsLocationProvider.cpp | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/location/java/android/location/GpsClock.java b/location/java/android/location/GpsClock.java index 963b604..610d268 100644 --- a/location/java/android/location/GpsClock.java +++ b/location/java/android/location/GpsClock.java @@ -492,6 +492,7 @@ public class GpsClock implements Parcelable { setType(TYPE_UNKNOWN); setTimeInNs(Long.MIN_VALUE); resetTimeUncertaintyInNs(); + resetFullBiasInNs(); resetBiasInNs(); resetBiasUncertaintyInNs(); resetDriftInNsPerSec(); diff --git a/services/core/jni/com_android_server_location_GpsLocationProvider.cpp b/services/core/jni/com_android_server_location_GpsLocationProvider.cpp index 6958087..8183321 100644 --- a/services/core/jni/com_android_server_location_GpsLocationProvider.cpp +++ b/services/core/jni/com_android_server_location_GpsLocationProvider.cpp @@ -1195,6 +1195,7 @@ static jobject translate_gps_measurement(JNIEnv* env, GpsMeasurement* measuremen usedInFixSetterMethod, (flags & GPS_MEASUREMENT_HAS_USED_IN_FIX) && measurement->used_in_fix); + env->DeleteLocalRef(gpsMeasurementClass); return gpsMeasurementObject; } |