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

automerge: c3e5599

* commit 'c3e5599cdc09a770d12433a98e7da93ec24d959d':
  Fix reference leak in GPS measurement JNI layer. b/16727892 b/17075171

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();

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;
 }