commit 435305d85190b3e5d2f40602727f94ad57982ada
author Treehugger Robot <treehugger-gerrit@google.com> Fri Jun 08 00:34:08 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Jun 08 00:34:08 2018 +0000
tree e121011e303a03e3f7ba8ee1be2d5108d136b643
parent 9b14a7f07ee26e27f391594425722e5b5dee1ff9
parent 73fdd6d2b88150d110b7b35da6342d3046f5e460

Merge "Delete JNI Object references created from arrays"

jni/com_android_bluetooth_avrcp_target.cpp

diff --git a/jni/com_android_bluetooth_avrcp_target.cpp b/jni/com_android_bluetooth_avrcp_target.cpp
index 0c721fb..d57d7b4 100644
--- a/jni/com_android_bluetooth_avrcp_target.cpp
+++ b/jni/com_android_bluetooth_avrcp_target.cpp
@@ -330,6 +330,7 @@
     const char* value = env->GetStringUTFChars(jstr, nullptr);
     info.media_id = std::string(value);
     env->ReleaseStringUTFChars(jstr, value);
+    env->DeleteLocalRef(jstr);
   }
 
   jstr = (jstring)env->GetObjectField(metadata, field_title);
@@ -338,6 +339,7 @@
     info.attributes.insert(
         AttributeEntry(Attribute::TITLE, std::string(value)));
     env->ReleaseStringUTFChars(jstr, value);
+    env->DeleteLocalRef(jstr);
   }
 
   jstr = (jstring)env->GetObjectField(metadata, field_artist);
@@ -346,6 +348,7 @@
     info.attributes.insert(
         AttributeEntry(Attribute::ARTIST_NAME, std::string(value)));
     env->ReleaseStringUTFChars(jstr, value);
+    env->DeleteLocalRef(jstr);
   }
 
   jstr = (jstring)env->GetObjectField(metadata, field_album);
@@ -354,6 +357,7 @@
     info.attributes.insert(
         AttributeEntry(Attribute::ALBUM_NAME, std::string(value)));
     env->ReleaseStringUTFChars(jstr, value);
+    env->DeleteLocalRef(jstr);
   }
 
   jstr = (jstring)env->GetObjectField(metadata, field_trackNum);
@@ -362,6 +366,7 @@
     info.attributes.insert(
         AttributeEntry(Attribute::TRACK_NUMBER, std::string(value)));
     env->ReleaseStringUTFChars(jstr, value);
+    env->DeleteLocalRef(jstr);
   }
 
   jstr = (jstring)env->GetObjectField(metadata, field_numTracks);
@@ -370,6 +375,7 @@
     info.attributes.insert(
         AttributeEntry(Attribute::TOTAL_NUMBER_OF_TRACKS, std::string(value)));
     env->ReleaseStringUTFChars(jstr, value);
+    env->DeleteLocalRef(jstr);
   }
 
   jstr = (jstring)env->GetObjectField(metadata, field_genre);
@@ -378,6 +384,7 @@
     info.attributes.insert(
         AttributeEntry(Attribute::GENRE, std::string(value)));
     env->ReleaseStringUTFChars(jstr, value);
+    env->DeleteLocalRef(jstr);
   }
 
   jstr = (jstring)env->GetObjectField(metadata, field_playingTime);
@@ -386,6 +393,7 @@
     info.attributes.insert(
         AttributeEntry(Attribute::PLAYING_TIME, std::string(value)));
     env->ReleaseStringUTFChars(jstr, value);
+    env->DeleteLocalRef(jstr);
   }
 
   return info;
@@ -495,6 +503,7 @@
   for (int i = 0; i < size; i++) {
     jobject song = sCallbackEnv->CallObjectMethod(song_list, method_get, i);
     ret.push_back(getSongInfoFromJavaObj(sCallbackEnv.get(), song));
+    sCallbackEnv->DeleteLocalRef(song);
   }
 
   return ret;
@@ -553,6 +562,7 @@
       const char* value = sCallbackEnv->GetStringUTFChars(jstr, nullptr);
       temp.name = std::string(value);
       sCallbackEnv->ReleaseStringUTFChars(jstr, value);
+      sCallbackEnv->DeleteLocalRef(jstr);
     }
 
     temp.browsing_supported =
@@ -561,6 +571,7 @@
             : false;
 
     ret_list.push_back(std::move(temp));
+    sCallbackEnv->DeleteLocalRef(player);
   }
 
   return ret_list;
@@ -662,6 +673,7 @@
 
       ret_list.push_back(temp);
     }
+    env->DeleteLocalRef(item);
   }
 
   callback.Run(std::move(ret_list));