drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix leaks of JNI objects in the local reference table" into klp-dev

Browse Source
This commit is contained in:
destradaa
2013-08-24 00:44:37 +00:00
committed by Android (Google) Code Review
parent c264e04400 b75cb3aeb4
commit 9e73cce6ac
1 changed files with 23 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
services/jni/com_android_server_location_FlpHardwareProvider.cpp
View File

@ -217,6 +217,8 @@ static void TranslateFromObject(
} }
// TODO: wire sources_used if Location class exposes them // TODO: wire sources_used if Location class exposes them
env->DeleteLocalRef(locationClass);
} }
/* /*
@ -257,6 +259,8 @@ static void TranslateFromObject(
jmethodID getFlags = env->GetMethodID(batchOptionsClass, "getFlags", "()I"); jmethodID getFlags = env->GetMethodID(batchOptionsClass, "getFlags", "()I");
batchOptions.flags = env->CallIntMethod(batchOptionsObject, getFlags); batchOptions.flags = env->CallIntMethod(batchOptionsObject, getFlags);
env->DeleteLocalRef(batchOptionsClass);
} }
/* /*
@ -326,6 +330,8 @@ static void TranslateGeofenceFromGeofenceHardwareRequestParcelable(
options->last_transition = env->CallIntMethod(geofenceRequestObject, getLastTransition); options->last_transition = env->CallIntMethod(geofenceRequestObject, getLastTransition);
// TODO: set data.sources_to_use when available // TODO: set data.sources_to_use when available
env->DeleteLocalRef(geofenceRequestClass);
} }
/* /*
@ -408,6 +414,8 @@ static void TranslateToObject(const FlpLocation* location, jobject& locationObje
} }
// TODO: wire FlpLocation::sources_used when needed // TODO: wire FlpLocation::sources_used when needed
sCallbackEnv->DeleteLocalRef(locationClass);
} }
/* /*
@ -430,6 +438,8 @@ static void TranslateToObjectArray(
sCallbackEnv->SetObjectArrayElement(locationsArray, i, locationObject); sCallbackEnv->SetObjectArrayElement(locationsArray, i, locationObject);
sCallbackEnv->DeleteLocalRef(locationObject); sCallbackEnv->DeleteLocalRef(locationObject);
} }
sCallbackEnv->DeleteLocalRef(locationClass);
} }
static void LocationCallback(int32_t locationsCount, FlpLocation** locations) { static void LocationCallback(int32_t locationsCount, FlpLocation** locations) {
@ -455,6 +465,10 @@ static void LocationCallback(int32_t locationsCount, FlpLocation** locations) {
locationsArray locationsArray
); );
CheckExceptions(sCallbackEnv, __FUNCTION__); CheckExceptions(sCallbackEnv, __FUNCTION__);
if(locationsArray != NULL) {
sCallbackEnv->DeleteLocalRef(locationsArray);
}
} }
static void AcquireWakelock() { static void AcquireWakelock() {
@ -522,6 +536,10 @@ static void GeofenceTransitionCallback(
sourcesUsed sourcesUsed
); );
CheckExceptions(sCallbackEnv, __FUNCTION__); CheckExceptions(sCallbackEnv, __FUNCTION__);
if(locationObject != NULL) {
sCallbackEnv->DeleteLocalRef(locationObject);
}
} }
static void GeofenceMonitorStatusCallback( static void GeofenceMonitorStatusCallback(
@ -545,6 +563,10 @@ static void GeofenceMonitorStatusCallback(
locationObject locationObject
); );
CheckExceptions(sCallbackEnv, __FUNCTION__); CheckExceptions(sCallbackEnv, __FUNCTION__);
if(locationObject != NULL) {
sCallbackEnv->DeleteLocalRef(locationObject);
}
} }
static void GeofenceAddCallback(int32_t geofenceId, int32_t result) { static void GeofenceAddCallback(int32_t geofenceId, int32_t result) {
@ -843,6 +865,7 @@ static void AddGeofences(
jobject geofenceObject = env->GetObjectArrayElement(geofenceRequestsArray, i); jobject geofenceObject = env->GetObjectArrayElement(geofenceRequestsArray, i);
TranslateGeofenceFromGeofenceHardwareRequestParcelable(env, geofenceObject, geofences[i]); TranslateGeofenceFromGeofenceHardwareRequestParcelable(env, geofenceObject, geofences[i]);
env->DeleteLocalRef(geofenceObject);
} }
sFlpGeofencingInterface->add_geofences(geofenceRequestsCount, &geofences); sFlpGeofencingInterface->add_geofences(geofenceRequestsCount, &geofences);