diff options
| -rw-r--r-- | core/java/android/server/BluetoothAdapterProperties.java | 3 | ||||
| -rw-r--r-- | core/jni/android_server_BluetoothService.cpp | 7 |
2 files changed, 3 insertions, 7 deletions
diff --git a/core/java/android/server/BluetoothAdapterProperties.java b/core/java/android/server/BluetoothAdapterProperties.java index ae8104bad954..9723f60243fd 100644 --- a/core/java/android/server/BluetoothAdapterProperties.java +++ b/core/java/android/server/BluetoothAdapterProperties.java @@ -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(","); diff --git a/core/jni/android_server_BluetoothService.cpp b/core/jni/android_server_BluetoothService.cpp index 158e47573c52..5c6958a4fd08 100644 --- a/core/jni/android_server_BluetoothService.cpp +++ b/core/jni/android_server_BluetoothService.cpp @@ -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; |