Fix usages of PopLocalFrame to include returned local reference
Change-Id: Ibd7a37b4035862718cb625110cfbba741537c17a
diff --git a/core/java/android/server/BluetoothAdapterProperties.java b/core/java/android/server/BluetoothAdapterProperties.java
index ae8104b..9723f60 100644
--- a/core/java/android/server/BluetoothAdapterProperties.java
+++ b/core/java/android/server/BluetoothAdapterProperties.java
@@ -76,14 +76,13 @@
for (int i = 0; i < properties.length; i++) {
String name = properties[i];
String newValue = null;
- int len;
if (name == null) {
Log.e(TAG, "Error:Adapter Property at index " + i + " is null");
continue;
}
if (name.equals("Devices") || name.equals("UUIDs")) {
StringBuilder str = new StringBuilder();
- len = Integer.valueOf(properties[++i]);
+ int len = Integer.valueOf(properties[++i]);
for (int j = 0; j < len; j++) {
str.append(properties[++i]);
str.append(",");
diff --git a/core/jni/android_server_BluetoothService.cpp b/core/jni/android_server_BluetoothService.cpp
index 158e475..5c6958a 100644
--- a/core/jni/android_server_BluetoothService.cpp
+++ b/core/jni/android_server_BluetoothService.cpp
@@ -695,9 +695,7 @@
str_array = parse_remote_device_properties(env, &iter);
dbus_message_unref(reply);
- env->PopLocalFrame(NULL);
-
- return str_array;
+ return (jobjectArray) env->PopLocalFrame(str_array);
}
#endif
return NULL;
@@ -731,8 +729,7 @@
str_array = parse_adapter_properties(env, &iter);
dbus_message_unref(reply);
- env->PopLocalFrame(NULL);
- return str_array;
+ return (jobjectArray) env->PopLocalFrame(str_array);
}
#endif
return NULL;