From c19b3a8ecf6191c94c9091abfc0e62945402ccb2 Mon Sep 17 00:00:00 2001
From: Yu-Han Yang <yuhany@google.com>
Date: Wed, 27 May 2020 16:18:16 -0700
Subject: [PATCH] Call DeleteLocalRef in GNSS JNI

Bug: 157380700
Test: manual
Change-Id: Ia5e5a84e1b17887b440c2c83894f0a8cfc50faf4
---
 ...d_server_location_GnssLocationProvider.cpp | 37 ++++++++++++++++---
 1 file changed, 32 insertions(+), 5 deletions(-)

diff --git a/services/core/jni/com_android_server_location_GnssLocationProvider.cpp b/services/core/jni/com_android_server_location_GnssLocationProvider.cpp
index e4061b4fc34cb..c7dac787c6538 100644
--- a/services/core/jni/com_android_server_location_GnssLocationProvider.cpp
+++ b/services/core/jni/com_android_server_location_GnssLocationProvider.cpp
@@ -337,7 +337,11 @@ JavaObject::JavaObject(JNIEnv* env, jclass clazz, jmethodID defaultCtor) : env_(
 
 JavaObject::JavaObject(JNIEnv* env, jclass clazz, jmethodID stringCtor, const char * sz_arg_1)
         : env_(env), clazz_(clazz) {
-    object_ = env_->NewObject(clazz_, stringCtor, env->NewStringUTF(sz_arg_1));
+    jstring szArg = env->NewStringUTF(sz_arg_1);
+    object_ = env_->NewObject(clazz_, stringCtor, szArg);
+    if (szArg) {
+        env_->DeleteLocalRef(szArg);
+    }
 }
 
 
@@ -724,6 +728,9 @@ Return<void> GnssCallback::gnssNameCb(const android::hardware::hidl_string& name
     JNIEnv* env = getJniEnv();
     jstring jstringName = env->NewStringUTF(name.c_str());
     env->CallVoidMethod(mCallbacksObj, method_setGnssHardwareModelName, jstringName);
+    if (jstringName) {
+        env->DeleteLocalRef(jstringName);
+    }
     checkAndClearExceptionFromCallback(env, __FUNCTION__);
 
     return Void();
@@ -827,6 +834,13 @@ Return<void> GnssCallback::gnssSvStatusCbImpl(const T& svStatus) {
             static_cast<jint>(listSize), svidWithFlagArray, cn0Array, elevArray, azimArray,
             carrierFreqArray, basebandCn0Array);
 
+    env->DeleteLocalRef(svidWithFlagArray);
+    env->DeleteLocalRef(cn0Array);
+    env->DeleteLocalRef(elevArray);
+    env->DeleteLocalRef(azimArray);
+    env->DeleteLocalRef(carrierFreqArray);
+    env->DeleteLocalRef(basebandCn0Array);
+
     checkAndClearExceptionFromCallback(env, __FUNCTION__);
     return Void();
 }
@@ -1429,13 +1443,18 @@ void GnssMeasurementCallback::translateSingleGnssMeasurement
     JNIEnv* env = getJniEnv();
     translateSingleGnssMeasurement(&(measurement_V2_0->v1_1), object);
 
-    SET(CodeType, env->NewStringUTF(measurement_V2_0->codeType.c_str()));
+    jstring codeType = env->NewStringUTF(measurement_V2_0->codeType.c_str());
+    SET(CodeType, codeType);
 
     // Overwrite with v2_0.state since v2_0->v1_1->v1_0.state is deprecated.
     SET(State, static_cast<int32_t>(measurement_V2_0->state));
 
     // Overwrite with v2_0.constellation since v2_0->v1_1->v1_0.constellation is deprecated.
     SET(ConstellationType, static_cast<int32_t>(measurement_V2_0->constellation));
+
+    if (codeType) {
+        env->DeleteLocalRef(codeType);
+    }
 }
 
 // Preallocate object as: JavaObject object(env, "android/location/GnssMeasurement");
@@ -1515,10 +1534,16 @@ void GnssMeasurementCallback::translateGnssClock(
     SET(ReferenceConstellationTypeForIsb,
             static_cast<int32_t>(clock.referenceSignalTypeForIsb.constellation));
     SET(ReferenceCarrierFrequencyHzForIsb, clock.referenceSignalTypeForIsb.carrierFrequencyHz);
-    SET(ReferenceCodeTypeForIsb,
-            env->NewStringUTF(clock.referenceSignalTypeForIsb.codeType.c_str()));
+
+    jstring referenceCodeTypeForIsb =
+            env->NewStringUTF(clock.referenceSignalTypeForIsb.codeType.c_str());
+    SET(ReferenceCodeTypeForIsb, referenceCodeTypeForIsb);
 
     translateGnssClock(object, clock.v1_0);
+
+    if (referenceCodeTypeForIsb) {
+        env->DeleteLocalRef(referenceCodeTypeForIsb);
+    }
 }
 
 template<>
@@ -1565,7 +1590,9 @@ jobjectArray GnssMeasurementCallback::translateAllGnssMeasurements(JNIEnv* env,
     for (uint16_t i = 0; i < count; ++i) {
         JavaObject object(env, class_gnssMeasurement, method_gnssMeasurementCtor);
         translateSingleGnssMeasurement(&(measurements[i]), object);
-        env->SetObjectArrayElement(gnssMeasurementArray, i, object.get());
+        jobject gnssMeasurement = object.get();
+        env->SetObjectArrayElement(gnssMeasurementArray, i, gnssMeasurement);
+        env->DeleteLocalRef(gnssMeasurement);
     }
 
     return gnssMeasurementArray;