Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix usages of PopLocalFrame to include returned local reference"

Browse Source
This commit is contained in:
Brian Carlstrom
2011-04-05 15:26:04 -07:00
committed by Android (Google) Code Review
parent 782c9d8709 b32b1ddf72
commit 3a6076ec28
2 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/java/android/server/BluetoothAdapterProperties.java
View File

@@ -76,14 +76,13 @@ class BluetoothAdapterProperties {
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(",");

7
core/jni/android_server_BluetoothService.cpp
View File

@@ -695,9 +695,7 @@ static jobjectArray getDevicePropertiesNative(JNIEnv *env, jobject object,
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 @@ static jobjectArray getAdapterPropertiesNative(JNIEnv *env, jobject object) {
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;